@xaendar/compiler 0.6.6 → 0.6.9

package/dist/xaendar-compiler.es.js

@@ -1756,26 +1756,11 @@ function isValidIdentifier(name) {
 * @returns The parsed `IfNode`.
 */
 function parseIfControlFlow(cursor, parseNode, token) {
-	return parseIfRecursively(cursor, parseNode, token);
+	return parseIfOrElseIf(cursor, parseNode, token);
 }
-function parseIfRecursively(cursor, parseNode, token) {
+function parseElseIfRecursively(cursor, parseNode, token) {
 	switch (token.type) {
-		case TokenType.IF:
-		case TokenType.ELSE_IF:
-			cursor.advance();
-			const conditionToken = cursor.peek();
-			if (conditionToken.type !== TokenType.CONDITION) throw new Error(`[Parser] Expected CONDITION after ${TokenType[token.type]}, got ${TokenType[conditionToken.type]}`);
-			cursor.advance(2);
-			const condition = conditionToken.parts[0];
-			const validationResult = validateExpression(condition);
-			const consequent = parseBlockChildren(cursor, parseNode);
-			return {
-				type: token.type === TokenType.IF ? ASTNodeType.If : ASTNodeType.ElseIf,
-				condition,
-				conditionNode: validationResult.node,
-				consequent,
-				alternate: parseIfRecursively(cursor, parseNode, cursor.peek())
-			};
+		case TokenType.ELSE_IF: return parseIfOrElseIf(cursor, parseNode, token);
 		case TokenType.ELSE:
 			cursor.advance(2);
 			const elseChildren = parseBlockChildren(cursor, parseNode);
@@ -1785,6 +1770,22 @@ function parseIfRecursively(cursor, parseNode, token) {
 			};
 	}
 }
+function parseIfOrElseIf(cursor, parseNode, token) {
+	cursor.advance();
+	const conditionToken = cursor.peek();
+	if (conditionToken.type !== TokenType.CONDITION) throw new Error(`[Parser] Expected CONDITION after ${TokenType[token.type]}, got ${TokenType[conditionToken.type]}`);
+	cursor.advance(2);
+	const condition = conditionToken.parts[0];
+	const validationResult = validateExpression(condition);
+	const consequent = parseBlockChildren(cursor, parseNode);
+	return {
+		type: token.type === TokenType.IF ? ASTNodeType.If : ASTNodeType.ElseIf,
+		condition,
+		conditionNode: validationResult.node,
+		consequent,
+		alternate: parseElseIfRecursively(cursor, parseNode, cursor.peek())
+	};
+}
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-switch.state.ts
 /**
@@ -2141,7 +2142,7 @@ var GLOBAL_IDENTIFIERS = new Set([
 	"Document",
 	"Window"
 ]);
-var ROOT_NODE = "this._root";
+var ROOT_NODE = "root";
 /**
 * Resolves references to component properties inside a template expression.
 *
@@ -2223,13 +2224,13 @@ function needsResolution(node, parent) {
 * @returns A string representing the unique variable name for the element.
 */
 function getElementIdentifier(node, parentNode, index) {
-	return (parentNode !== "this._root" ? `${parentNode}_${node.tagName}${index}` : `${node.tagName}${index}`).replace(/-/g, "_");
+	return (parentNode !== "root" ? `${parentNode}_${node.tagName}${index}` : `${node.tagName}${index}`).replace(/-/g, "_");
 }
 function getTextIdentifier(parentNode, index, prefix = "text") {
-	return (parentNode !== "this._root" ? `${parentNode}_${prefix}${index}` : `${prefix}${index}`).replace(/-/g, "_");
+	return (parentNode !== "root" ? `${parentNode}_${prefix}${index}` : `${prefix}${index}`).replace(/-/g, "_");
 }
 function getBlockIdentifier(parentNode, index, prefix) {
-	return (parentNode !== "this._root" ? `${parentNode}_${prefix}${index}` : `${prefix}${index}`).replace(/-/g, "_");
+	return (parentNode !== "root" ? `${parentNode}_${prefix}${index}` : `${prefix}${index}`).replace(/-/g, "_");
 }
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-const-declaration.state.ts
@@ -2367,9 +2368,13 @@ function processFor(node, nodeName, parentNode, parentContext) {
 	const forKey = getBlockIdentifier(parentNode, nodeName, "for");
 	functionsToProcess.set(forKey, {
 		code: [`const { ${node.itemAlias}, ${indexName}, ${firstName}, ${lastName}, ${evenName}, ${oddName} } = _iterationVariables(${itemsName}, ${counterName});`, ...node.children.flatMap((child, i) => processNode(child, `${nodeName}_${i}`, parentNode, forContext))],
-		args: [itemsName, counterName]
+		args: [
+			parentNode,
+			itemsName,
+			counterName
+		]
 	});
-	mainBlock.push(`_for(unwatchFns, () => ${iterableExpr}, this.${forKey}.bind(this));`);
+	mainBlock.push(`_for(${parentNode}, unwatchFns, () => ${iterableExpr}, this.${forKey}.bind(this));`);
 	return {
 		mainBlock,
 		fns: functionsToProcess
@@ -2411,7 +2416,10 @@ function processIf(node, nodeName, parentNode, context) {
 		condition: resolveExpression(node.conditionNode, context),
 		block: `this.${ifKey}.bind(this)`
 	});
-	functionsToProcess.set(ifKey, processConsequent(node, nodeName, parentNode, ifContext));
+	functionsToProcess.set(ifKey, {
+		code: processConsequent(node, nodeName, parentNode, ifContext),
+		args: [parentNode]
+	});
 	let alt = node.alternate;
 	let index = 0;
 	while (alt?.type === ASTNodeType.ElseIf) {
@@ -2422,22 +2430,28 @@ function processIf(node, nodeName, parentNode, context) {
 			condition: resolveExpression(conditionNode, context),
 			block: `this.${keyElseIf}.bind(this)`
 		});
-		functionsToProcess.set(keyElseIf, processConsequent(alt, nodeName, parentNode, elseIfContext));
+		functionsToProcess.set(keyElseIf, {
+			code: processConsequent(alt, nodeName, parentNode, elseIfContext),
+			args: [parentNode]
+		});
 		alt = alt.alternate;
 	}
 	if (alt) {
 		const elseContext = new Context([], context);
 		const keyElse = getBlockIdentifier(parentNode, nodeName, "else");
 		mainBlock.push({ block: `this.${keyElse}.bind(this)` });
-		functionsToProcess.set(keyElse, processConsequent(alt, nodeName, parentNode, elseContext));
+		functionsToProcess.set(keyElse, {
+			code: processConsequent(alt, nodeName, parentNode, elseContext),
+			args: [parentNode]
+		});
 	}
 	return {
 		mainBlock: [
-			"_if(unwatchFns, [",
+			`_if(${parentNode}, unwatchFns, [`,
 			...indent(mainBlock.map(({ condition, block }) => {
 				return [
 					"{",
-					...indent(condition ? [`condition: ${condition.toString()},`, `block: ${block.toString()}`] : [`block: ${block.toString()}`]),
+					...indent(condition ? [`condition: () => ${condition.toString()},`, `block: ${block.toString()}`] : [`block: ${block.toString()}`]),
 					"},"
 				];
 			}).flat()),
@@ -2468,7 +2482,10 @@ function processSwitch(node, nodeName, parentNode, context) {
 	node.cases.forEach((caseNode, i) => {
 		const caseContext = new Context([], context);
 		const caseName = caseNode.condition ? getBlockIdentifier(parentNode, `${nodeName}_${i}`, "case") : getBlockIdentifier(parentNode, nodeName, "default");
-		functionsToProcess.set(caseName, caseNode.children.map((child, i) => processNode(child, `${nodeName}_${i}_${i}`, parentNode, caseContext)).flat());
+		functionsToProcess.set(caseName, {
+			code: caseNode.children.map((child, i) => processNode(child, `${nodeName}_${i}_${i}`, parentNode, caseContext)).flat(),
+			args: [parentNode]
+		});
 		blocks.push({
 			condition: caseNode.condition,
 			block: `this.${caseName}.bind(this)`
@@ -2476,7 +2493,7 @@ function processSwitch(node, nodeName, parentNode, context) {
 	});
 	return {
 		mainBlock: [
-			`_switch(unwatchFns, () => ${resolveExpression(node.expression, context)}, [`,
+			`_switch(${parentNode}, unwatchFns, () => ${resolveExpression(node.expression, context)}, [`,
 			...indent(blocks.map(({ condition, block }) => {
 				return [
 					"{",
@@ -2521,26 +2538,21 @@ var nodeToProcess = /* @__PURE__ */ new Map();
 */
 function generateRenderFunction(ast, cssVariableName) {
 	nodeToProcess.clear();
-	const context = new Context();
-	const renderFunctions = ["_render() {"];
-	if (cssVariableName) renderFunctions.push(indent(`this._root.adoptedStyleSheets = [${cssVariableName}];`));
+	const context = new Context([ROOT_NODE]);
+	const renderFunctions = ["_render() {", indent(`const ${ROOT_NODE} = this._root;`)];
+	if (cssVariableName) renderFunctions.push(indent(`${ROOT_NODE}.adoptedStyleSheets = [${cssVariableName}];`));
 	renderFunctions.push(...indent([
 		"let unwatchFns = [];",
 		...ast.map((node, i) => [...processNode(node, i.toString(), ROOT_NODE, context)]).flat(),
 		"return unwatchFns;"
 	]), "}");
-	while (nodeToProcess.size > 0) {
+	while (nodeToProcess.size) {
 		const [key, fnData] = nodeToProcess.entries().next().value;
-		if ("args" in fnData) renderFunctions.push(`${key}(${fnData.args.join(", ")}) {`, ...indent([
+		renderFunctions.push(`${key}(${fnData.args.join(", ")}) {`, ...indent([
 			"let unwatchFns = [];",
 			...fnData.fn(...fnData.args),
 			"return unwatchFns;"
 		]), "}");
-		else renderFunctions.push(`${key}() {`, ...indent([
-			"let unwatchFns = [];",
-			...fnData.fn(),
-			"return unwatchFns;"
-		]), "}");
 		nodeToProcess.delete(key);
 	}
 	return renderFunctions.join("\n");
@@ -2557,7 +2569,10 @@ function processNode(node, nodeName, parentNode, context) {
 		case ASTNodeType.Element: return processElement(node, getElementIdentifier(node, parentNode, nodeName), parentNode, context);
 		case ASTNodeType.If:
 			const conditionalBlockData = processIf(node, nodeName, parentNode, context);
-			conditionalBlockData.fns.forEach((fnBody, key) => nodeToProcess.set(key, { fn: () => fnBody }));
+			conditionalBlockData.fns.forEach((fnBody, key) => nodeToProcess.set(key, {
+				fn: () => fnBody.code,
+				args: fnBody.args
+			}));
 			return conditionalBlockData.mainBlock;
 		case ASTNodeType.For:
 			const forBlockData = processFor(node, nodeName, parentNode, context);
@@ -2568,7 +2583,10 @@ function processNode(node, nodeName, parentNode, context) {
 			return forBlockData.mainBlock;
 		case ASTNodeType.Switch:
 			const switchBlockData = processSwitch(node, nodeName, parentNode, context);
-			switchBlockData.fns.forEach((fnBody, key) => nodeToProcess.set(key, { fn: () => fnBody }));
+			switchBlockData.fns.forEach((fnBody, key) => nodeToProcess.set(key, {
+				fn: () => fnBody.code,
+				args: fnBody.args
+			}));
 			return switchBlockData.mainBlock;
 		case ASTNodeType.ConstDeclaration: return processConstDeclaration(node, nodeName, parentNode, context);
 		default: return [];

package/package.json

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