@xaendar/compiler 0.5.1 → 0.5.3

package/dist/xaendar-compiler.es.js

@@ -489,6 +489,7 @@ function consumeInterpolationExpression(cursor, context) {
 			deep--;
 			if (deep === 0) {
 				cursor.advance();
+				interpolation = interpolation.trimEnd();
 				const previousState = context.history.pop();
 				let state;
 				switch (previousState) {
@@ -1190,158 +1191,6 @@ var ASTNodeType = /* @__PURE__ */ function(ASTNodeType) {
 	return ASTNodeType;
 }({});
 //#endregion
-//#region ../packages/compiler/src/parser/states/parse-const-declaration.state.ts
-/**
-* Parses a CONST_DECLARATION token into a `ConstDeclarationNode`.
-*
-* @param cursor Parser cursor; advanced past the CONST_DECLARATION token.
-* @param _parseNode Unused parser function.
-* @param token The CONST_DECLARATION token containing variable name and expression.
-* @returns The parsed `ConstDeclarationNode`.
-*/
-function parseConstDeclaration(cursor, _parseNode, token) {
-	cursor.advance();
-	return {
-		type: ASTNodeType.ConstDeclaration,
-		varName: token.parts[0],
-		expression: token.parts[1]
-	};
-}
-//#endregion
-//#region ../packages/compiler/src/parser/states/parse-interpolation.state.ts
-/**
-* Parses an interpolation expression or literal token into an `InterpolationNode`.
-*
-* @param cursor Parser cursor; advanced past the interpolation token.
-* @param _parseNode Unused parser function.
-* @param token The INTERPOLATION_EXPRESSION or INTERPOLATION_LITERAL token.
-* @returns The parsed `InterpolationNode`.
-*/
-function parseInterpolation(cursor, _parseNode, token) {
-	cursor.advance();
-	return {
-		type: ASTNodeType.Interpolation,
-		expression: token.parts[0]
-	};
-}
-//#endregion
-//#region ../packages/compiler/src/parser/states/parse-attribute.state.ts
-/**
-* Parses an ATTRIBUTE token into an `AttributeNode`.
-* Handles boolean attributes (no `=`), string values, and interpolation values.
-*
-* @param cursor Parser cursor; advanced past the ATTRIBUTE token.
-* @param parseNode Parser node function for recursive parsing.
-* @param token The ATTRIBUTE token to parse.
-* @returns The parsed `AttributeNode`.
-*/
-function parseAttribute(cursor, parseNode, token) {
-	cursor.advance();
-	const raw = token.parts[0];
-	if (!raw.includes("=")) return {
-		name: raw,
-		value: "true"
-	};
-	const [name, value] = raw.split("=");
-	if (!name) throw new Error(`[Parser] Attribute name missing in: ${raw}`);
-	const nextToken = cursor.peek();
-	if (nextToken.type === TokenType.INTERPOLATION_EXPRESSION || nextToken.type === TokenType.INTERPOLATION_LITERAL) return {
-		name,
-		value: parseInterpolation(cursor, parseNode, nextToken)
-	};
-	if (!value) throw new Error(`[Parser] Attribute value missing for ${name} in: ${raw}`);
-	return {
-		name,
-		value: value.replace(/^['']|['']$/g, "")
-	};
-}
-//#endregion
-//#region ../packages/compiler/src/parser/states/parse-event.state.ts
-/**
-* Parses an EVENT token into an `EventNode` by splitting the raw
-* `eventName=handler` string.
-*
-* @param cursor Parser cursor; advanced past the EVENT token.
-* @param _parseNode Unused parser function.
-* @param token The EVENT token to parse.
-* @returns The parsed `EventNode`.
-*/
-function parseEvent(cursor, _parseNode, token) {
-	cursor.advance();
-	const raw = token.parts[0];
-	const [name, value] = raw.split("=");
-	if (!name || !value) throw new Error(`[Parser] Invalid event format: ${raw}`);
-	return {
-		name,
-		handler: value.replace(/^[""]|[""]$/g, "")
-	};
-}
-//#endregion
-//#region ../packages/compiler/src/parser/states/parse-element.state.ts
-/**
-* Parses a TAG_OPEN_NAME token and the subsequent attributes, events, and children
-* into an `ElementNode`. Handles both regular and self-closing tags.
-*
-* @param cursor Parser cursor positioned at the TAG_OPEN_NAME token.
-* @param context Parser context for recursive child parsing.
-* @param token The TAG_OPEN_NAME token containing the tag name.
-* @returns The parsed `ElementNode`.
-*/
-function parseElement(cursor, parseNode, token) {
-	cursor.advance();
-	const tagName = token.parts[0];
-	const attributes = new Array();
-	const events = new Array();
-	let read = true;
-	while (read) {
-		const token = cursor.peek();
-		switch (token.type) {
-			case TokenType.ATTRIBUTE:
-				attributes.push(parseAttribute(cursor, parseNode, token));
-				break;
-			case TokenType.EVENT:
-				events.push(parseEvent(cursor, parseNode, token));
-				break;
-			default: read = false;
-		}
-	}
-	if (cursor.peek().type === TokenType.TAG_OPEN_END) cursor.advance();
-	if (cursor.peek().type === TokenType.TAG_SELF_CLOSE) {
-		cursor.advance();
-		return {
-			type: ASTNodeType.Element,
-			tagName,
-			attributes,
-			events,
-			children: []
-		};
-	}
-	const children = new Array();
-	while (!isTagClose(cursor, tagName)) {
-		const child = parseNode();
-		if (child) children.push(child);
-	}
-	cursor.advance();
-	return {
-		type: ASTNodeType.Element,
-		tagName,
-		attributes,
-		events,
-		children
-	};
-}
-/**
-* Returns `true` if the next token in the stream is a closing tag for the given tag name.
-*
-* @param cursor Parser cursor to peek from.
-* @param tagName The expected tag name to match.
-* @returns `true` if the next token is TAG_CLOSE_NAME matching `tagName`.
-*/
-function isTagClose(cursor, tagName) {
-	const nextToken = cursor.peek();
-	return nextToken.type === TokenType.TAG_CLOSE_NAME && nextToken.parts[0] === tagName;
-}
-//#endregion
 //#region ../packages/compiler/src/parser/utils/expression-validator.ts
 /**
 * Validates that a string contains a single expression belonging to the
@@ -1519,6 +1368,158 @@ function isAssignmentOperator(kind) {
 	return kind >= ts.SyntaxKind.FirstAssignment && kind <= ts.SyntaxKind.LastAssignment;
 }
 //#endregion
+//#region ../packages/compiler/src/parser/states/parse-const-declaration.state.ts
+/**
+* Parses a CONST_DECLARATION token into a `ConstDeclarationNode`.
+*
+* @param cursor Parser cursor; advanced past the CONST_DECLARATION token.
+* @param _parseNode Unused parser function.
+* @param token The CONST_DECLARATION token containing variable name and expression.
+* @returns The parsed `ConstDeclarationNode`.
+*/
+function parseConstDeclaration(cursor, _parseNode, token) {
+	cursor.advance();
+	return {
+		type: ASTNodeType.ConstDeclaration,
+		varName: token.parts[0],
+		expression: validateExpression(token.parts[1]).node
+	};
+}
+//#endregion
+//#region ../packages/compiler/src/parser/states/parse-interpolation.state.ts
+/**
+* Parses an interpolation expression or literal token into an `InterpolationNode`.
+*
+* @param cursor Parser cursor; advanced past the interpolation token.
+* @param _parseNode Unused parser function.
+* @param token The INTERPOLATION_EXPRESSION or INTERPOLATION_LITERAL token.
+* @returns The parsed `InterpolationNode`.
+*/
+function parseInterpolation(cursor, _parseNode, token) {
+	cursor.advance();
+	return {
+		type: ASTNodeType.Interpolation,
+		expression: validateExpression(token.parts[0]).node
+	};
+}
+//#endregion
+//#region ../packages/compiler/src/parser/states/parse-attribute.state.ts
+/**
+* Parses an ATTRIBUTE token into an `AttributeNode`.
+* Handles boolean attributes (no `=`), string values, and interpolation values.
+*
+* @param cursor Parser cursor; advanced past the ATTRIBUTE token.
+* @param parseNode Parser node function for recursive parsing.
+* @param token The ATTRIBUTE token to parse.
+* @returns The parsed `AttributeNode`.
+*/
+function parseAttribute(cursor, parseNode, token) {
+	cursor.advance();
+	const raw = token.parts[0];
+	if (!raw.includes("=")) return {
+		name: raw,
+		value: "true"
+	};
+	const [name, value] = raw.split("=");
+	if (!name) throw new Error(`[Parser] Attribute name missing in: ${raw}`);
+	const nextToken = cursor.peek();
+	if (nextToken.type === TokenType.INTERPOLATION_EXPRESSION || nextToken.type === TokenType.INTERPOLATION_LITERAL) return {
+		name,
+		value: parseInterpolation(cursor, parseNode, nextToken)
+	};
+	if (!value) throw new Error(`[Parser] Attribute value missing for ${name} in: ${raw}`);
+	return {
+		name,
+		value: value.replace(/^['']|['']$/g, "")
+	};
+}
+//#endregion
+//#region ../packages/compiler/src/parser/states/parse-event.state.ts
+/**
+* Parses an EVENT token into an `EventNode` by splitting the raw
+* `eventName=handler` string.
+*
+* @param cursor Parser cursor; advanced past the EVENT token.
+* @param _parseNode Unused parser function.
+* @param token The EVENT token to parse.
+* @returns The parsed `EventNode`.
+*/
+function parseEvent(cursor, _parseNode, token) {
+	cursor.advance();
+	const raw = token.parts[0];
+	const [name, value] = raw.split("=");
+	if (!name || !value) throw new Error(`[Parser] Invalid event format: ${raw}`);
+	return {
+		name,
+		handler: value.replace(/^[""]|[""]$/g, "")
+	};
+}
+//#endregion
+//#region ../packages/compiler/src/parser/states/parse-element.state.ts
+/**
+* Parses a TAG_OPEN_NAME token and the subsequent attributes, events, and children
+* into an `ElementNode`. Handles both regular and self-closing tags.
+*
+* @param cursor Parser cursor positioned at the TAG_OPEN_NAME token.
+* @param context Parser context for recursive child parsing.
+* @param token The TAG_OPEN_NAME token containing the tag name.
+* @returns The parsed `ElementNode`.
+*/
+function parseElement(cursor, parseNode, token) {
+	cursor.advance();
+	const tagName = token.parts[0];
+	const attributes = new Array();
+	const events = new Array();
+	let read = true;
+	while (read) {
+		const token = cursor.peek();
+		switch (token.type) {
+			case TokenType.ATTRIBUTE:
+				attributes.push(parseAttribute(cursor, parseNode, token));
+				break;
+			case TokenType.EVENT:
+				events.push(parseEvent(cursor, parseNode, token));
+				break;
+			default: read = false;
+		}
+	}
+	if (cursor.peek().type === TokenType.TAG_OPEN_END) cursor.advance();
+	if (cursor.peek().type === TokenType.TAG_SELF_CLOSE) {
+		cursor.advance();
+		return {
+			type: ASTNodeType.Element,
+			tagName,
+			attributes,
+			events,
+			children: []
+		};
+	}
+	const children = new Array();
+	while (!isTagClose(cursor, tagName)) {
+		const child = parseNode();
+		if (child) children.push(child);
+	}
+	cursor.advance();
+	return {
+		type: ASTNodeType.Element,
+		tagName,
+		attributes,
+		events,
+		children
+	};
+}
+/**
+* Returns `true` if the next token in the stream is a closing tag for the given tag name.
+*
+* @param cursor Parser cursor to peek from.
+* @param tagName The expected tag name to match.
+* @returns `true` if the next token is TAG_CLOSE_NAME matching `tagName`.
+*/
+function isTagClose(cursor, tagName) {
+	const nextToken = cursor.peek();
+	return nextToken.type === TokenType.TAG_CLOSE_NAME && nextToken.parts[0] === tagName;
+}
+//#endregion
 //#region ../packages/compiler/src/parser/states/parse-block-children.state.ts
 /**
 * Parses child AST nodes inside a flow-control block until a BLOCK_CLOSE token is reached.
@@ -1760,7 +1761,7 @@ function parseSwitchControlFlow(cursor, parseNode, _token) {
 	cursor.advance();
 	const conditionToken = cursor.peek();
 	if (conditionToken.type !== TokenType.CONDITION) throw new Error(`[Parser] Expected CONDITION after SWITCH, got ${TokenType[conditionToken.type]}`);
-	const expression = conditionToken.parts[0];
+	const expression = validateExpression(conditionToken.parts[0]).node;
 	cursor.advance(2);
 	const cases = new Array();
 	while (cursor.peek().type !== TokenType.BLOCK_CLOSE) switch (cursor.peek().type) {
@@ -2129,7 +2130,7 @@ var ROOT_NODE = "this._root";
 * // → typeof this.id !== 'boolean' || this.pippo instanceof HTMLElement
 */
 function resolveExpression(expression, context) {
-	return typeof expression === "string" ? context.getIdentifier(expression) ?? `this.${expression}` : emitNode(expression, expression, context);
+	return emitNode(expression, expression, context);
 }
 /**
 * Emits the resolved text for a node.
@@ -2295,7 +2296,7 @@ function processFor(node, nodeName, parentNode, parentContext) {
 		],
 		args: [itemsName, counterName]
 	});
-	mainBlock.push("(() => {", ...indent("let localUnwatchFns = [];", "const unwatch = () => {", ...indent("localUnwatchFns?.forEach(fn => fn());", "localUnwatchFns = [];", "unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));"), "};", "unwatchFns.push(", ...indent("effect(() => {", ...indent("unwatch();", `const ${itemsName} = ${iterableExpr};`, "Signal.subtle.untrack(() => {", ...indent(`for (let ${counterName} = 0; ${counterName} < ${itemsName}.length; ${counterName}++) {`, ...indent(`localUnwatchFns.push(...this.for_${nodeName}(${itemsName}, ${counterName}));`, "unwatchFns.push(...localUnwatchFns);"), "}"), "});"), "})"), ");"), "})();");
+	mainBlock.push("(() => {", ...indent("let localUnwatchFns = [];", "const unwatch = () => {", ...indent("unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));", "localUnwatchFns?.forEach(fn => fn());", "localUnwatchFns = [];"), "};", "unwatchFns.push(", ...indent("effect(() => {", ...indent("unwatch();", `const ${itemsName} = ${iterableExpr};`, "Signal.subtle.untrack(() => {", ...indent(`for (let ${counterName} = 0; ${counterName} < ${itemsName}.length; ${counterName}++) {`, ...indent(`localUnwatchFns.push(...this.for_${nodeName}(${itemsName}, ${counterName}));`, "unwatchFns.push(...localUnwatchFns);"), "}"), "});"), "})"), ");"), "})();");
 	return {
 		mainBlock,
 		fns: functionsToProcess
@@ -2355,7 +2356,7 @@ function processIf(node, nodeName, parentNode, context) {
 	return {
 		mainBlock: [
 			"(() => {",
-			...indent("let state;", "let localUnwatchFns = []", "const checkAndUpdateState = (newState, fn) => {", ...indent("if (state === newState) {", ...indent("return;"), "}", "state = newState;", "unwatch();", "localUnwatchFns = Signal.subtle.untrack(fn);", "unwatchFns.push(...localUnwatchFns);"), "};", "const unwatch = () => {", ...indent("localUnwatchFns?.forEach(fn => fn());", "unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));", "localUnwatchFns = [];"), "}", "unwatchFns.push(", ...indent("effect(() => {", ...indent(...mainBlock), "})"), ");"),
+			...indent("let state;", "let localUnwatchFns = []", "const checkAndUpdateState = (newState, fn) => {", ...indent("if (state === newState) {", ...indent("return;"), "}", "state = newState;", "unwatch();", "localUnwatchFns = Signal.subtle.untrack(fn);", "unwatchFns.push(...localUnwatchFns);"), "};", "const unwatch = () => {", ...indent("unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));", "localUnwatchFns?.forEach(fn => fn());", "localUnwatchFns = [];"), "}", "unwatchFns.push(", ...indent("effect(() => {", ...indent(...mainBlock), "})"), ");"),
 			"})();"
 		],
 		fns: functionsToProcess
@@ -2391,7 +2392,7 @@ function processSwitch(node, nodeName, parentNode, context) {
 	return {
 		mainBlock: [
 			"(() => {",
-			...indent("let localUnwatchFns = []", "const checkAndUpdateState = (newState, fn) => {", ...indent("unwatch();", "localUnwatchFns = Signal.subtle.untrack(fn);", "unwatchFns.push(...localUnwatchFns);"), "};", "const unwatch = () => {", ...indent("localUnwatchFns?.forEach(fn => fn());", "unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));", "localUnwatchFns = [];"), "}", "unwatchFns.push(", ...indent("effect(() => {", ...indent("unwatch();", ...mainBlock), "})"), ");"),
+			...indent("let localUnwatchFns = []", "const unwatch = () => {", ...indent("unwatchFns = unwatchFns.filter(fn => !localUnwatchFns.includes(fn));", "localUnwatchFns?.forEach(fn => fn());", "localUnwatchFns = [];"), "}", "unwatchFns.push(", ...indent("effect(() => {", ...indent("unwatch();", ...mainBlock), "})"), ");"),
 			"})();"
 		],
 		fns: functionsToProcess

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaendar/compiler",
-  "version": "0.5.1",
+  "version": "0.5.3",
   "description": "A library for transpiling Xaendar Templates into JavaScript code",
   "sideEffects": false,
   "type": "module",
@@ -16,8 +16,8 @@
     }
   },
   "dependencies": {
-    "@xaendar/common": "0.5.1",
-    "@xaendar/types": "0.5.1",
+    "@xaendar/common": "0.5.3",
+    "@xaendar/types": "0.5.3",
     "typescript": "^6.0.3"
   }
 }