@xaendar/compiler 0.6.17 → 0.6.19

package/dist/xaendar-compiler.es.js

@@ -38,6 +38,10 @@ var LexerState = /* @__PURE__ */ function(LexerState) {
 	*/
 	LexerState["EVENT"] = "event";
 	/**
+	* Consuming a DOM event parameter
+	*/
+	LexerState["EVENT_PARAMETER"] = "parameter";
+	/**
 	* Dispatching a flow-control keyword (@if, @for, @switch, etc.).
 	*/
 	LexerState["FLOW_CONTROL"] = "flow-control";
@@ -111,57 +115,61 @@ var TokenType = /* @__PURE__ */ function(TokenType) {
 	*/
 	TokenType[TokenType["EVENT"] = 7] = "EVENT";
 	/**
+	* An event paremeter included in a event call '()'
+	*/
+	TokenType[TokenType["EVENT_PAREMETER"] = 8] = "EVENT_PAREMETER";
+	/**
 	* A template-literal interpolation string enclosed in `` {`...`} ``.
 	*/
-	TokenType[TokenType["INTERPOLATION_LITERAL"] = 8] = "INTERPOLATION_LITERAL";
+	TokenType[TokenType["INTERPOLATION_LITERAL"] = 9] = "INTERPOLATION_LITERAL";
 	/**
 	* A JavaScript expression interpolation enclosed in `{ }`.
 	*/
-	TokenType[TokenType["INTERPOLATION_EXPRESSION"] = 9] = "INTERPOLATION_EXPRESSION";
+	TokenType[TokenType["INTERPOLATION_EXPRESSION"] = 10] = "INTERPOLATION_EXPRESSION";
 	/**
 	* Opening keyword of an `@if` directive.
 	*/
-	TokenType[TokenType["IF"] = 10] = "IF";
+	TokenType[TokenType["IF"] = 11] = "IF";
 	/**
 	* Opening keyword of a `@for` directive.
 	*/
-	TokenType[TokenType["FOR"] = 11] = "FOR";
+	TokenType[TokenType["FOR"] = 12] = "FOR";
 	/**
 	* Opening keyword of an `@else` branch.
 	*/
-	TokenType[TokenType["ELSE"] = 12] = "ELSE";
+	TokenType[TokenType["ELSE"] = 13] = "ELSE";
 	/**
 	* Opening keyword of an `@else if` branch.
 	*/
-	TokenType[TokenType["ELSE_IF"] = 13] = "ELSE_IF";
+	TokenType[TokenType["ELSE_IF"] = 14] = "ELSE_IF";
 	/**
 	* Opening keyword of a `@switch` directive.
 	*/
-	TokenType[TokenType["SWITCH"] = 14] = "SWITCH";
+	TokenType[TokenType["SWITCH"] = 15] = "SWITCH";
 	/**
 	* Opening keyword of a `@case` branch.
 	*/
-	TokenType[TokenType["CASE"] = 15] = "CASE";
+	TokenType[TokenType["CASE"] = 16] = "CASE";
 	/**
 	* Opening keyword of a `@default` branch.
 	*/
-	TokenType[TokenType["DEFAULT"] = 16] = "DEFAULT";
+	TokenType[TokenType["DEFAULT"] = 17] = "DEFAULT";
 	/**
 	* The condition expression `(...)` associated with a flow-control directive.
 	*/
-	TokenType[TokenType["CONDITION"] = 17] = "CONDITION";
+	TokenType[TokenType["CONDITION"] = 18] = "CONDITION";
 	/**
 	* The opening `{` of a flow-control block body.
 	*/
-	TokenType[TokenType["BLOCK_OPEN"] = 18] = "BLOCK_OPEN";
+	TokenType[TokenType["BLOCK_OPEN"] = 19] = "BLOCK_OPEN";
 	/**
 	* The closing `}` of a flow-control block body.
 	*/
-	TokenType[TokenType["BLOCK_CLOSE"] = 19] = "BLOCK_CLOSE";
+	TokenType[TokenType["BLOCK_CLOSE"] = 20] = "BLOCK_CLOSE";
 	/**
 	* Sentinel token emitted when the end of the input is reached.
 	*/
-	TokenType[TokenType["EOF"] = 20] = "EOF";
+	TokenType[TokenType["EOF"] = 21] = "EOF";
 	return TokenType;
 }({});
 //#endregion
@@ -270,7 +278,7 @@ function consumeFlowControlCondition(cursor, _context) {
 	while (depth > 0) switch (cursor.peek()) {
 		case 40:
 			depth++;
-			expression = addCharacter$2(cursor, expression);
+			expression = addCharacter$3(cursor, expression);
 			break;
 		case 41:
 			depth--;
@@ -278,9 +286,9 @@ function consumeFlowControlCondition(cursor, _context) {
 				cursor.advance();
 				break;
 			}
-			expression = addCharacter$2(cursor, expression);
+			expression = addCharacter$3(cursor, expression);
 			break;
-		default: expression = addCharacter$2(cursor, expression);
+		default: expression = addCharacter$3(cursor, expression);
 	}
 	return expression;
 }
@@ -291,7 +299,7 @@ function consumeFlowControlCondition(cursor, _context) {
 * @param expression - The current accumulated expression string.
 * @returns The updated string with the newly consumed character appended.
 */
-function addCharacter$2(cursor, expression) {
+function addCharacter$3(cursor, expression) {
 	cursor.advance();
 	return `${expression}${cursor.currentChar.value}`;
 }
@@ -340,6 +348,64 @@ function consumeDefaultFlowControlCondition(cursor, _context) {
 	};
 }
 //#endregion
+//#region ../packages/compiler/src/lexer/states/event-parameter.state.ts
+/**
+* Consumes an event parameter and reads until a ',' or ')'.
+* Emits an EVENT_ATTRIBUTE token containing the raw paremeter string.
+*
+* @param cursor - The lexer cursor positioned on the `@` character.
+* @param _context - Unused lexer context.
+* @returns Transition result with the EVENT_PAREMETER token and the EVENT state.
+*/
+function consumeEventParameter(cursor, _context) {
+	let read = true;
+	let eventParameter = "";
+	let charDelimiter = "";
+	const retVal = {
+		state: LexerState.TAG_BODY,
+		tokens: []
+	};
+	cursor.advance();
+	cursor.skipSpaces();
+	while (read) switch (cursor.peek()) {
+		case 91:
+		case 123:
+		case 34:
+		case 39:
+		case 40:
+			eventParameter = addCharacter$2(cursor, eventParameter);
+			if (!charDelimiter) charDelimiter = cursor.currentChar.value;
+			else if (charDelimiter === cursor.currentChar.value) charDelimiter = "";
+			break;
+		case 44:
+			if (!charDelimiter) {
+				retVal.tokens.push({
+					type: TokenType.EVENT_PAREMETER,
+					parts: [eventParameter]
+				});
+				cursor.advance();
+				cursor.skipSpaces();
+				eventParameter = "";
+			} else eventParameter = addCharacter$2(cursor, eventParameter);
+			break;
+		case 41:
+			cursor.advance();
+			if (!charDelimiter) {
+				retVal.tokens.push({
+					type: TokenType.EVENT_PAREMETER,
+					parts: [eventParameter]
+				});
+				read = false;
+			}
+		default: eventParameter = addCharacter$2(cursor, eventParameter);
+	}
+	return retVal;
+}
+function addCharacter$2(cursor, eventParameter) {
+	cursor.advance();
+	return `${eventParameter}${cursor.currentChar.value}`;
+}
+//#endregion
 //#region ../packages/compiler/src/lexer/states/event.state.ts
 /**
 * Consumes a DOM event binding starting with `@` and reads until a delimiter
@@ -353,34 +419,31 @@ function consumeEvent(cursor, _context) {
 	let read = true;
 	let event = "";
 	let retVal;
-	let deep = 0;
 	cursor.advance();
 	while (read) switch (cursor.peek()) {
 		case 32:
 		case 47:
 		case 62:
-			if (deep === 0) {
-				retVal = {
-					state: LexerState.TAG_BODY,
-					tokens: [{
-						type: TokenType.EVENT,
-						parts: [event]
-					}]
-				};
-				read = false;
-			}
+			retVal = { state: LexerState.TAG_BODY };
+			read = false;
 			break;
 		case 40:
-			deep++;
-			cursor.advance();
+		case 44:
+			retVal = {
+				state: LexerState.EVENT_PARAMETER,
+				tokens: [{
+					type: TokenType.EVENT,
+					parts: [event]
+				}]
+			};
+			read = false;
 			break;
 		case 41:
-			deep--;
-			cursor.advance();
+			retVal = { state: LexerState.TAG_BODY };
 			break;
 		default:
 			cursor.advance();
-			if (deep === 0) event = `${event}${cursor.currentChar.value}`;
+			event = `${event}${cursor.currentChar.value}`;
 	}
 	return retVal;
 }
@@ -1025,11 +1088,12 @@ var Lexer = class {
 		[LexerState.TAG_CLOSE]: consumeTagClose,
 		[LexerState.ATTRIBUTE]: consumeAttribute,
 		[LexerState.ATTRIBUTE_VALUE]: consumeAttributeValue,
+		[LexerState.EVENT]: consumeEvent,
+		[LexerState.EVENT_PARAMETER]: consumeEventParameter,
 		[LexerState.FLOW_CONTROL]: consumeFlowControl,
 		[LexerState.FLOW_CONTROL_CONDITION]: consumeDefaultFlowControlCondition,
 		[LexerState.CASE_FLOW_CONTROL_CONDITION]: consumeCaseFlowControlCondition,
 		[LexerState.FLOW_CONTROL_BLOCK]: consumeFlowControlBlock,
-		[LexerState.EVENT]: consumeEvent,
 		[LexerState.INTERPOLATION]: consumeInterpolation,
 		[LexerState.INTERPOLATION_EXPRESSION]: consumeInterpolationExpression,
 		[LexerState.INTERPOLATION_LITERAL]: consumeInterpolationliteral
@@ -1100,7 +1164,7 @@ var ParserCursor = class {
 	/**
 	* Returns a read-only snapshot of the current token.
 	*/
-	get currentToken() {
+	getCcurrentToken() {
 		return this._currentToken;
 	}
 	/**
@@ -1435,9 +1499,15 @@ function parseEvent(cursor, _parseNode, token) {
 	const raw = token.parts[0];
 	const [name, value] = raw.split("=");
 	if (!name || !value) throw new Error(`[Parser] Invalid event format: ${raw}`);
+	const parameters = new Array();
+	while (cursor.peek().type === TokenType.EVENT_PAREMETER) {
+		cursor.advance();
+		parameters.push(validateExpression(cursor.getCcurrentToken().value.parts[0]).node);
+	}
 	return {
 		name,
-		handler: value.replace(/^[""]|[""]$/g, "")
+		handler: value.replace(/^[""]|[""]$/g, ""),
+		parameters
 	};
 }
 //#endregion
@@ -1600,7 +1670,7 @@ function parseForExpression(source, baseOffset) {
 function parseImplicitAliases(source, baseOffset, out) {
 	const entries = source.split(",");
 	let cursor = 0;
-	const IMPLICIT_VARIABLES = new Set([
+	const IMPLICIT_VARIABLES = /* @__PURE__ */ new Set([
 		"$index",
 		"$last",
 		"$first",
@@ -1898,6 +1968,9 @@ var CompilerContext = class {
 		if (this.hasIdentifier(name)) throw new Error(`Identifier "${name}" is already declared in this scope.`);
 		this._identifiers.push(name);
 	}
+	removeIdentifier(name) {
+		this._identifiers = this._identifiers.filter((identifier) => identifier !== name);
+	}
 	/**
 	* Returns `true` if an identifier with the given name is declared in this
 	* scope or any of its ancestor scopes.
@@ -1926,7 +1999,7 @@ var CompilerContext = class {
 *
 * @see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects
 */
-var GLOBAL_IDENTIFIERS = new Set([
+var GLOBAL_IDENTIFIERS = /* @__PURE__ */ new Set([
 	"undefined",
 	"NaN",
 	"Infinity",
@@ -2220,7 +2293,7 @@ function getBlockIdentifier(parentNode, index, prefix) {
 */
 function processElement(node, nodeName, parentNode, compilerContext) {
 	const attributes = mapAttributes(node.attributes, compilerContext);
-	const events = mapEvents(node.events);
+	const events = mapEvents(node.events, compilerContext);
 	const code = [`const ${nodeName} = _renderElement(${parentNode}, context, '${node.tagName}',`];
 	attributes.length ? code.push(...indent([
 		"[",
@@ -2255,10 +2328,34 @@ function mapAttributes(attributes, compilerContext) {
 * to the component instance handler and exposing the native event as `$event`.
 *
 * @param events - The event nodes to bind to the element.
+* @param compilerContext - Current render scope context, used to resolve identifier references.
 * @returns Array of generated code lines, one per event listener.
 */
-function mapEvents(events) {
-	return events?.map((event) => `{ name: '${event.name}', handler: '${event.handler}' }`);
+function mapEvents(events, compilerContext) {
+	compilerContext.addIdentifier("$event");
+	const mappedEvents = events?.map((event) => {
+		let parsedEventParameter = false;
+		const parameters = event.parameters.map((parameter) => {
+			const resolvedParameter = resolveExpression(parameter, compilerContext);
+			if (!parsedEventParameter && resolvedParameter === "$event") {
+				parsedEventParameter = true;
+				return `($event) => ${resolvedParameter},`;
+			} else return `() => ${resolvedParameter},`;
+		});
+		return [
+			"{",
+			...indent([
+				`name: '${event.name}',`,
+				`handler: '${event.handler}',`,
+				"parameters: [",
+				...indent(parameters),
+				"]"
+			]),
+			"}"
+		];
+	}).flat();
+	compilerContext.removeIdentifier("$event");
+	return mappedEvents;
 }
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-for.state.ts

package/package.json

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