@xaendar/compiler 0.3.17 → 0.3.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xaendar/compiler",
-  "version": "0.3.17",
+  "version": "0.3.18",
   "description": "A library containing compiler engine",
   "sideEffects": false,
   "type": "module",
@@ -16,8 +16,8 @@
     }
   },
   "dependencies": {
-    "@xaendar/common": "0.3.17",
-    "@xaendar/types": "0.3.17",
+    "@xaendar/common": "0.3.18",
+    "@xaendar/types": "0.3.18",
     "typescript": "^6.0.3"
   }
 }

package/xaendar-compiler.es.js

@@ -213,10 +213,10 @@ function m(e, t) {
 //#endregion
 //#region ../packages/compiler/src/lexer/states/interpolation-literal.state.ts
 function h(e, t) {
-	let i = !0, a = "", o;
+	let i = !0, a = "`", o;
 	for (e.advance(); i;) switch (e.peek()) {
 		case 96:
-			if (e.advance(), e.peek() === 125) {
+			if (a = g(e, a), e.peek() === 125) {
 				e.advance();
 				let s = t.history.pop(), c;
 				switch (s) {
@@ -252,7 +252,7 @@ function v(e) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/interpolation.state.ts
-function ee(e, t) {
+function y(e, t) {
 	let r;
 	e.advance(), e.skipSpaces();
 	let i = e.peek();
@@ -263,7 +263,7 @@ function ee(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/tag-body.state.ts
-function y(e, t) {
+function b(e, t) {
 	let r = !0, i;
 	for (; r;) switch (e.peek()) {
 		case 64:
@@ -282,7 +282,7 @@ function y(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/tag-close.state.ts
-function te(e, t) {
+function ee(e, t) {
 	let i = !0, a = "", o;
 	for (e.advance(2), e.skipSpaces(); i;) switch (e.peek()) {
 		case 62:
@@ -301,7 +301,7 @@ function te(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/tag-open-end.state.ts
-function ne(e, t) {
+function te(e, t) {
 	let i;
 	if (e.peek() === 62) e.advance(), i = {
 		state: n.TEXT,
@@ -326,7 +326,7 @@ function ne(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/tag-open-name.state.ts
-function re(e, t) {
+function ne(e, t) {
 	let i = !0, a = "", o;
 	for (e.advance(), e.skipSpaces(); i;) switch (e.peek()) {
 		case 32:
@@ -346,7 +346,7 @@ function re(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/states/text.state.ts
-function b(e, t) {
+function x(e, t) {
 	let i = !0, a = "", o;
 	for (; i;) switch (e.peek()) {
 		case 60:
@@ -381,7 +381,7 @@ function b(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/lexer/types/lexer-cursor.model.ts
-var ie = class {
+var re = class {
 	input;
 	_currentChar = {
 		code: 0,
@@ -437,32 +437,32 @@ var ie = class {
 	throwEOFError() {
 		throw Error("", { cause: 0 });
 	}
-}, ae = class {
+}, ie = class {
 	input;
 	_cursor;
 	_state = n.START;
 	_stack = new e();
 	_tokens = [];
 	_states = {
-		[n.START]: b,
-		[n.TEXT]: b,
-		[n.TAG_OPEN_NAME]: re,
-		[n.TAG_BODY]: y,
-		[n.TAG_OPEN_END]: ne,
-		[n.TAG_CLOSE]: te,
+		[n.START]: x,
+		[n.TEXT]: x,
+		[n.TAG_OPEN_NAME]: ne,
+		[n.TAG_BODY]: b,
+		[n.TAG_OPEN_END]: te,
+		[n.TAG_CLOSE]: ee,
 		[n.ATTRIBUTE]: i,
 		[n.FLOW_CONTROL]: f,
 		[n.FLOW_CONTROL_CONDITION]: d,
 		[n.CASE_FLOW_CONTROL_CONDITION]: s,
 		[n.FLOW_CONTROL_BLOCK]: u,
 		[n.EVENT]: l,
-		[n.INTERPOLATION]: ee,
+		[n.INTERPOLATION]: y,
 		[n.INTERPOLATION_EXPRESSION]: p,
 		[n.INTERPOLATION_LITERAL]: h,
 		[n.CONST_DECLARATION]: c
 	};
 	constructor(e) {
-		this.input = e, this._cursor = new ie(this.input);
+		this.input = e, this._cursor = new re(this.input);
 	}
 	tokenize() {
 		let e = !1;
@@ -478,7 +478,7 @@ var ie = class {
 		}
 		return this._tokens;
 	}
-}, oe = class {
+}, ae = class {
 	_tokens;
 	_currentToken = {
 		value: { type: r.EOF },
@@ -507,14 +507,14 @@ var ie = class {
 	peekOneToken(e) {
 		return e < this._tokens.length ? this._tokens[e] : { type: r.EOF };
 	}
-}, x = /* @__PURE__ */ function(e) {
+}, S = /* @__PURE__ */ function(e) {
 	return e[e.Element = 0] = "Element", e[e.Text = 1] = "Text", e[e.Interpolation = 2] = "Interpolation", e[e.If = 3] = "If", e[e.Else = 4] = "Else", e[e.ElseIf = 5] = "ElseIf", e[e.For = 6] = "For", e[e.Switch = 7] = "Switch", e[e.Case = 8] = "Case", e[e.ConstDeclaration = 9] = "ConstDeclaration", e;
 }({});
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-const-declaration.state.ts
-function S(e, t, n) {
+function oe(e, t, n) {
 	return e.advance(), {
-		type: x.ConstDeclaration,
+		type: S.ConstDeclaration,
 		varName: n.parts[0],
 		expression: n.parts[1]
 	};
@@ -523,13 +523,13 @@ function S(e, t, n) {
 //#region ../packages/compiler/src/parser/states/parse-interpolation.state.ts
 function C(e, t, n) {
 	return e.advance(), {
-		type: x.Interpolation,
+		type: S.Interpolation,
 		expression: n.parts[0]
 	};
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-attribute.state.ts
-function se(e, t, n) {
+function w(e, t, n) {
 	e.advance();
 	let i = n.parts[0];
 	if (!i.includes("=")) return {
@@ -551,7 +551,7 @@ function se(e, t, n) {
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-event.state.ts
-function ce(e, t, n) {
+function se(e, t, n) {
 	e.advance();
 	let r = n.parts[0], [i, a] = r.split("=");
 	if (!i || !a) throw Error(`[Parser] Invalid event format: ${r}`);
@@ -562,57 +562,57 @@ function ce(e, t, n) {
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-element.state.ts
-function le(e, t, n) {
+function ce(e, t, n) {
 	e.advance();
 	let i = n.parts[0], a = [], o = [], s = !0;
 	for (; s;) {
 		let n = e.peek();
 		switch (n.type) {
 			case r.ATTRIBUTE:
-				a.push(se(e, t, n));
+				a.push(w(e, t, n));
 				break;
 			case r.EVENT:
-				o.push(ce(e, t, n));
+				o.push(se(e, t, n));
 				break;
 			default: s = !1;
 		}
 	}
 	if (e.peek().type === r.TAG_OPEN_END && e.advance(), e.peek().type === r.TAG_SELF_CLOSE) return e.advance(), {
-		type: x.Element,
+		type: S.Element,
 		tagName: i,
 		attributes: a,
 		events: o,
 		children: []
 	};
 	let c = [];
-	for (; !ue(e, i);) {
+	for (; !le(e, i);) {
 		let e = t();
 		e && c.push(e);
 	}
 	return e.advance(), {
-		type: x.Element,
+		type: S.Element,
 		tagName: i,
 		attributes: a,
 		events: o,
 		children: c
 	};
 }
-function ue(e, t) {
+function le(e, t) {
 	let n = e.peek();
 	return n.type === r.TAG_CLOSE_NAME && n.parts[0] === t;
 }
 //#endregion
 //#region ../packages/compiler/src/parser/utils/expression-validator.ts
-function w(e) {
+function T(e) {
 	let n = t.createSourceFile("expression.ts", `const x = ${e}`, t.ScriptTarget.ESNext, !0).statements[0].declarationList.declarations[0].initializer, r = [];
-	if (T(n, 10, r), r.length) throw Error(r.reduce((e, t) => `${e}${t.message}\n`, ""));
+	if (E(n, 10, r), r.length) throw Error(r.reduce((e, t) => `${e}${t.message}\n`, ""));
 	return { node: n };
 }
-function T(e, n, r) {
-	if (!E(e)) throw Error(D(e));
-	if (t.forEachChild(e, (e) => T(e, n, r)), r.length) throw Error(r[0].message);
+function E(e, n, r) {
+	if (!D(e)) throw Error(O(e));
+	if (t.forEachChild(e, (e) => E(e, n, r)), r.length) throw Error(r[0].message);
 }
-function E(e) {
+function D(e) {
 	switch (e.kind) {
 		case t.SyntaxKind.StringLiteral:
 		case t.SyntaxKind.NumericLiteral:
@@ -673,7 +673,7 @@ function E(e) {
 		default: return !1;
 	}
 }
-function D(e) {
+function O(e) {
 	switch (e.kind) {
 		case t.SyntaxKind.AwaitExpression: return "'await' is not allowed inside template expressions.";
 		case t.SyntaxKind.YieldExpression: return "'yield' is not allowed inside template expressions.";
@@ -681,16 +681,16 @@ function D(e) {
 		case t.SyntaxKind.ArrowFunction:
 		case t.SyntaxKind.FunctionExpression: return "Function expressions are not allowed inside template expressions.";
 		case t.SyntaxKind.TaggedTemplateExpression: return "Tagged template expressions are not allowed inside template expressions.";
-		case t.SyntaxKind.BinaryExpression: return O(e.operatorToken.kind) ? "Assignments are not allowed inside template expressions. Use @const to declare local template variables instead." : `'${t.SyntaxKind[e.kind]}' is not allowed inside template expressions.`;
+		case t.SyntaxKind.BinaryExpression: return k(e.operatorToken.kind) ? "Assignments are not allowed inside template expressions. Use @const to declare local template variables instead." : `'${t.SyntaxKind[e.kind]}' is not allowed inside template expressions.`;
 		default: return `'${t.SyntaxKind[e.kind]}' is not allowed inside template expressions.`;
 	}
 }
-function O(e) {
+function k(e) {
 	return e >= t.SyntaxKind.FirstAssignment && e <= t.SyntaxKind.LastAssignment;
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-block-children.state.ts
-function k(e, t) {
+function A(e, t) {
 	let n = [];
 	for (; e.peek().type !== r.BLOCK_CLOSE;) {
 		let e = t();
@@ -700,30 +700,30 @@ function k(e, t) {
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-for.state.ts
-function A(e, t, n) {
+function j(e, t, n) {
 	e.advance();
 	let i = e.peek();
 	if (i.type !== r.CONDITION) throw Error(`[Parser] Expected CONDITION after FOR, got ${r[i.type]}`);
-	let a = j(i.parts[0], 0);
+	let a = M(i.parts[0], 0);
 	e.advance(2);
-	let o = k(e, t);
+	let o = A(e, t);
 	return {
-		type: x.For,
+		type: S.For,
 		...a,
 		children: o
 	};
 }
-function j(e, t) {
-	let n = N(e);
+function M(e, t) {
+	let n = P(e);
 	if (n.length < 2) throw Error("[Parser] @for requires at least \"item of iterable; track expr\".");
 	let r = n[0].trim(), i = r.indexOf(" of ");
 	if (i === -1) throw Error("[Parser] @for expression must be in the form \"item of iterable\".");
 	let a = r.slice(0, i).trim(), o = r.slice(i + 4).trim();
-	if (!P(a)) throw Error(`[Parser] '${a}' is not a valid item alias.`);
-	let s = w(o), c = n[1].trim();
+	if (!F(a)) throw Error(`[Parser] '${a}' is not a valid item alias.`);
+	let s = T(o), c = n[1].trim();
 	if (!c.startsWith("track ")) throw Error("[Parser] Second section of @for must start with \"track\".");
-	let l = c.slice(6).trim(), u = w(l), d = /* @__PURE__ */ new Map();
-	return n.length >= 3 && n[2] !== void 0 && M(n[2].trim(), t + e.indexOf(n[2]), d), {
+	let l = c.slice(6).trim(), u = T(l), d = /* @__PURE__ */ new Map();
+	return n.length >= 3 && n[2] !== void 0 && N(n[2].trim(), t + e.indexOf(n[2]), d), {
 		itemAlias: a,
 		iterableExpression: s.node,
 		iterableSource: o,
@@ -732,7 +732,7 @@ function j(e, t) {
 		implicitAliases: d
 	};
 }
-function M(e, t, n) {
+function N(e, t, n) {
 	let r = e.split(","), i = 0, a = new Set([
 		"$index",
 		"$last",
@@ -746,12 +746,12 @@ function M(e, t, n) {
 		i += e.length + 1;
 		let o = t.slice(0, r).trim(), s = t.slice(r + 1).trim();
 		if (!((e) => a.has(e))(o)) throw Error(`[Parser] '${o}' is not a known implicit variable. Known variables: ${[...a].join(", ")}.`);
-		if (i += e.length + 1, !P(s)) throw Error(`[Parser] '${s}' is not a valid alias identifier.`);
+		if (i += e.length + 1, !F(s)) throw Error(`[Parser] '${s}' is not a valid alias identifier.`);
 		if (i += e.length + 1, n.has(o)) throw Error(`[Parser] '${o}' is already aliased in this @for expression.`);
 		n.set(o, s), i += e.length + 1;
 	}
 }
-function N(e) {
+function P(e) {
 	let t = [], n = "", r = 0, i;
 	for (let a = 0; a < e.length; a++) {
 		let o = e[a];
@@ -781,17 +781,17 @@ function N(e) {
 	}
 	return n.trim().length > 0 && t.push(n), t;
 }
-function P(e) {
+function F(e) {
 	if (!e.length) return !1;
 	let n = t.createSourceFile("__id.ts", e, t.ScriptTarget.ESNext, !1).statements[0];
 	return !!n && t.isExpressionStatement(n) && t.isIdentifier(n.expression) && n.expression.text === e;
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-if.state.ts
-function F(e, t, n) {
-	return I(e, t, n);
-}
 function I(e, t, n) {
+	return L(e, t, n);
+}
+function L(e, t, n) {
 	switch (n.type) {
 		case r.IF:
 		case r.ELSE_IF:
@@ -799,26 +799,26 @@ function I(e, t, n) {
 			let i = e.peek();
 			if (i.type !== r.CONDITION) throw Error(`[Parser] Expected CONDITION after ${r[n.type]}, got ${r[i.type]}`);
 			e.advance(2);
-			let a = i.parts[0], o = w(a), s = k(e, t);
+			let a = i.parts[0], o = T(a), s = A(e, t);
 			return {
-				type: n.type === r.IF ? x.If : x.ElseIf,
+				type: n.type === r.IF ? S.If : S.ElseIf,
 				condition: a,
 				conditionNode: o.node,
 				consequent: s,
-				alternate: I(e, t, e.peek())
+				alternate: L(e, t, e.peek())
 			};
 		case r.ELSE:
 			e.advance(2);
-			let c = k(e, t);
+			let c = A(e, t);
 			return {
-				type: x.Else,
+				type: S.Else,
 				consequent: c
 			};
 	}
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-switch.state.ts
-function L(e, t, n) {
+function R(e, t, n) {
 	e.advance();
 	let i = e.peek();
 	if (i.type !== r.CONDITION) throw Error(`[Parser] Expected CONDITION after SWITCH, got ${r[i.type]}`);
@@ -835,50 +835,50 @@ function L(e, t, n) {
 				n.push(t.parts[0]), e.advance();
 			} while (e.peek().type !== r.BLOCK_OPEN);
 			e.advance(), o.push({
-				type: x.Case,
+				type: S.Case,
 				condition: n,
-				children: k(e, t)
+				children: A(e, t)
 			});
 			break;
 		case r.DEFAULT:
 			e.advance(2), o.push({
-				type: x.Case,
+				type: S.Case,
 				condition: null,
-				children: k(e, t)
+				children: A(e, t)
 			});
 			break;
 	}
 	return e.advance(), {
-		type: x.Switch,
+		type: S.Switch,
 		expression: a,
 		cases: o
 	};
 }
 //#endregion
 //#region ../packages/compiler/src/parser/states/parse-text.state.ts
-function R(e, t, n) {
+function z(e, t, n) {
 	return e.advance(), {
-		type: x.Text,
+		type: S.Text,
 		value: n.parts[0]
 	};
 }
 //#endregion
 //#region ../packages/compiler/src/parser/parser.ts
-var z = class {
+var B = class {
 	tokens;
 	_cursor;
 	_states = {
-		[r.TEXT]: R,
+		[r.TEXT]: z,
 		[r.INTERPOLATION_EXPRESSION]: C,
 		[r.INTERPOLATION_LITERAL]: C,
-		[r.TAG_OPEN_NAME]: le,
-		[r.IF]: F,
-		[r.FOR]: A,
-		[r.SWITCH]: L,
-		[r.CONST_DECLARATION]: S
+		[r.TAG_OPEN_NAME]: ce,
+		[r.IF]: I,
+		[r.FOR]: j,
+		[r.SWITCH]: R,
+		[r.CONST_DECLARATION]: oe
 	};
 	constructor(e) {
-		this.tokens = e, this._cursor = new oe(this.tokens);
+		this.tokens = e, this._cursor = new ae(this.tokens);
 	}
 	parse() {
 		let e = [];
@@ -895,7 +895,7 @@ var z = class {
 		if (!t) throw Error(`[Parser] No transition function for token type ${r[e.type]}`);
 		return t(this._cursor, this.parseNode.bind(this), e);
 	}
-}, B = class {
+}, V = class {
 	_identifiers;
 	_parent;
 	constructor(e = [], t) {
@@ -908,7 +908,7 @@ var z = class {
 	getIdentifier(e) {
 		return this._identifiers.includes(e) ? e : this._parent?.getIdentifier(e);
 	}
-}, V = new Set(/* @__PURE__ */ "undefined.NaN.Infinity.globalThis.eval.isFinite.isNaN.parseFloat.parseInt.decodeURI.decodeURIComponent.encodeURI.encodeURIComponent.escape.unescape.Object.Function.Boolean.Symbol.Error.AggregateError.EvalError.RangeError.ReferenceError.SyntaxError.TypeError.URIError.SuppressedError.InternalError.Number.BigInt.Math.Date.Temporal.String.RegExp.Array.TypedArray.Int8Array.Uint8Array.Uint8ClampedArray.Int16Array.Uint16Array.Int32Array.Uint32Array.BigInt64Array.BigUint64Array.Float16Array.Float32Array.Float64Array.Map.Set.WeakMap.WeakSet.ArrayBuffer.SharedArrayBuffer.DataView.Atomics.JSON.WeakRef.FinalizationRegistry.Iterator.AsyncIterator.Promise.GeneratorFunction.AsyncGeneratorFunction.Generator.AsyncGenerator.AsyncFunction.DisposableStack.AsyncDisposableStack.Reflect.Proxy.Intl.WebAssembly.window.document.navigator.location.history.screen.console.performance.crypto.fetch.alert.confirm.prompt.setTimeout.setInterval.clearTimeout.clearInterval.requestAnimationFrame.cancelAnimationFrame.queueMicrotask.structuredClone.URL.URLSearchParams.FormData.Headers.Request.Response.AbortController.AbortSignal.CustomEvent.Event.EventTarget.MutationObserver.IntersectionObserver.ResizeObserver.PerformanceObserver.Worker.SharedWorker.ServiceWorker.Blob.File.FileReader.ReadableStream.WritableStream.TransformStream.TextEncoder.TextDecoder.ImageData.Canvas.Storage.localStorage.sessionStorage.indexedDB.WebSocket.XMLHttpRequest.HTMLElement.HTMLInputElement.HTMLButtonElement.HTMLFormElement.HTMLAnchorElement.HTMLImageElement.HTMLVideoElement.HTMLAudioElement.HTMLCanvasElement.HTMLSelectElement.HTMLTextAreaElement.HTMLDivElement.HTMLSpanElement.HTMLParagraphElement.HTMLHeadingElement.HTMLTableElement.HTMLTableRowElement.HTMLTableCellElement.HTMLUListElement.HTMLOListElement.HTMLLIElement.HTMLLabelElement.HTMLDialogElement.HTMLDetailsElement.HTMLSlotElement.HTMLTemplateElement.SVGElement.SVGSVGElement.Element.Node.NodeList.DocumentFragment.ShadowRoot.Document.Window".split(".")), H = "this._root";
+}, ue = new Set(/* @__PURE__ */ "undefined.NaN.Infinity.globalThis.eval.isFinite.isNaN.parseFloat.parseInt.decodeURI.decodeURIComponent.encodeURI.encodeURIComponent.escape.unescape.Object.Function.Boolean.Symbol.Error.AggregateError.EvalError.RangeError.ReferenceError.SyntaxError.TypeError.URIError.SuppressedError.InternalError.Number.BigInt.Math.Date.Temporal.String.RegExp.Array.TypedArray.Int8Array.Uint8Array.Uint8ClampedArray.Int16Array.Uint16Array.Int32Array.Uint32Array.BigInt64Array.BigUint64Array.Float16Array.Float32Array.Float64Array.Map.Set.WeakMap.WeakSet.ArrayBuffer.SharedArrayBuffer.DataView.Atomics.JSON.WeakRef.FinalizationRegistry.Iterator.AsyncIterator.Promise.GeneratorFunction.AsyncGeneratorFunction.Generator.AsyncGenerator.AsyncFunction.DisposableStack.AsyncDisposableStack.Reflect.Proxy.Intl.WebAssembly.window.document.navigator.location.history.screen.console.performance.crypto.fetch.alert.confirm.prompt.setTimeout.setInterval.clearTimeout.clearInterval.requestAnimationFrame.cancelAnimationFrame.queueMicrotask.structuredClone.URL.URLSearchParams.FormData.Headers.Request.Response.AbortController.AbortSignal.CustomEvent.Event.EventTarget.MutationObserver.IntersectionObserver.ResizeObserver.PerformanceObserver.Worker.SharedWorker.ServiceWorker.Blob.File.FileReader.ReadableStream.WritableStream.TransformStream.TextEncoder.TextDecoder.ImageData.Canvas.Storage.localStorage.sessionStorage.indexedDB.WebSocket.XMLHttpRequest.HTMLElement.HTMLInputElement.HTMLButtonElement.HTMLFormElement.HTMLAnchorElement.HTMLImageElement.HTMLVideoElement.HTMLAudioElement.HTMLCanvasElement.HTMLSelectElement.HTMLTextAreaElement.HTMLDivElement.HTMLSpanElement.HTMLParagraphElement.HTMLHeadingElement.HTMLTableElement.HTMLTableRowElement.HTMLTableCellElement.HTMLUListElement.HTMLOListElement.HTMLLIElement.HTMLLabelElement.HTMLDialogElement.HTMLDetailsElement.HTMLSlotElement.HTMLTemplateElement.SVGElement.SVGSVGElement.Element.Node.NodeList.DocumentFragment.ShadowRoot.Document.Window".split(".")), H = "this._root";
 function U(e, t) {
 	return typeof e == "string" ? t.getIdentifier(e) ?? `this.${e}` : W(e, e, t);
 }
@@ -928,7 +928,7 @@ function G(e, n) {
 	}), r;
 }
 function K(e, n) {
-	return !(t.isPropertyAccessExpression(n) && n.name === e || V.has(e.text));
+	return !(t.isPropertyAccessExpression(n) && n.name === e || ue.has(e.text));
 }
 function q(...e) {
 	return e.map((e) => `  ${e}`);
@@ -947,10 +947,10 @@ function fe(e, t, n, r) {
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-element.state.ts
 function Y(e, t, n, r) {
-	let i = new B([], r);
+	let i = new V([], r);
 	return [
 		`const ${t} = document.createElement("${e.tagName}");`,
-		...e.attributes?.map((e) => `${t}.setAttribute('${e.name}', ${typeof e.value == "string" ? e.value : `this.${e.value.expression}`});`) || [],
+		...e.attributes?.map((e) => `${t}.setAttribute('${e.name}', ${typeof e.value == "string" ? e.value : `${U(e.value.expression, r)}`});`) || [],
 		...e.events?.map((e) => `${t}.addEventListener("${e.name}", ($event) => this.${e.handler}.bind(this));`) || [],
 		`${n}.appendChild(${t});`,
 		...e.children.map((e, n) => $(e, n.toString(), t, i)).flat()
@@ -959,7 +959,7 @@ function Y(e, t, n, r) {
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-for.state.ts
 function pe(e, t, n, r) {
-	let i = e.iterableSource, a = r.getIdentifier(i) ?? `this.${i}`, o = J(n, t, "items"), s = J(n, t, "i"), c = X(e, "$index"), l = X(e, "$first"), u = X(e, "$last"), d = X(e, "$even"), f = X(e, "$odd"), p = new B([
+	let i = e.iterableSource, a = r.getIdentifier(i) ?? `this.${i}`, o = J(n, t, "items"), s = J(n, t, "i"), c = X(e, "$index"), l = X(e, "$first"), u = X(e, "$last"), d = X(e, "$even"), f = X(e, "$odd"), p = new V([
 		e.itemAlias,
 		c,
 		l,
@@ -987,17 +987,17 @@ function X(e, t) {
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-if.state.ts
 function me(e, t, n, r) {
-	let i = new B([], r), a = [
+	let i = new V([], r), a = [
 		`if (${U(e.conditionNode, r)}) {`,
 		...Z(e, t, n, i),
 		"}"
 	], o = e.alternate;
-	for (; o?.type === x.ElseIf;) {
-		let e = new B([], r);
+	for (; o?.type === S.ElseIf;) {
+		let e = new V([], r);
 		a[a.length - 1] += ` else if (${U(o.conditionNode, r)}) {`, a.push(...Z(o, t, n, e), "}"), o = o.alternate;
 	}
 	if (o) {
-		let e = new B([], r);
+		let e = new V([], r);
 		a[a.length - 1] += " else {", a.push(...Z(o, t, n, e), "}");
 	}
 	return a;
@@ -1010,21 +1010,21 @@ function Z(e, t, n, r) {
 function he(e, t, n, r) {
 	return [
 		`switch (${U(e.expression, r)}) {`,
-		...e.cases.map((e) => [...q(...e.condition ? e.condition.map((e, t, n) => `case ${e}:${t === n.length - 1 ? " {" : ""}`) : ["default: {"], ...e.children.map((e, i) => q(...$(e, `${t}_${i}_${i}`, n, new B([], r)))).flat(), `${q("break;")}`, "}")]).flat(),
+		...e.cases.map((e) => [...q(...e.condition ? e.condition.map((e, t, n) => `case ${e}:${t === n.length - 1 ? " {" : ""}`) : ["default: {"], ...e.children.map((e, i) => q(...$(e, `${t}_${i}_${i}`, n, new V([], r)))).flat(), `${q("break;")}`, "}")]).flat(),
 		"}"
 	];
 }
 //#endregion
 //#region ../packages/compiler/src/render-generator/states/process-text-and-interpolation.state.ts
 function ge(e, t, n, r) {
-	return [`const ${t} = document.createTextNode(${e.type === x.Text ? JSON.stringify(e.value) : U(e.expression, r)});`, `${n}.appendChild(${t});`];
+	return [`const ${t} = document.createTextNode(${e.type === S.Text ? JSON.stringify(e.value) : U(e.expression, r)});`, `${n}.appendChild(${t});`];
 }
 //#endregion
 //#region ../packages/compiler/src/render-generator/render-generator.ts
 var Q = /* @__PURE__ */ new Map();
 function _e(e) {
 	Q.clear();
-	let t = new B(), n = [
+	let t = new V(), n = [
 		"_render() {",
 		...q(...e.map((e, n) => [...$(e, n.toString(), H, t), ""]).flat()),
 		"}"
@@ -1037,26 +1037,26 @@ function _e(e) {
 }
 function $(e, t, n, r) {
 	switch (e.type) {
-		case x.Text:
-		case x.Interpolation: return ge(e, J(n, t), n, r);
-		case x.Element: return Y(e, de(e, n, t), n, r);
-		case x.If:
+		case S.Text:
+		case S.Interpolation: return ge(e, J(n, t), n, r);
+		case S.Element: return Y(e, de(e, n, t), n, r);
+		case S.If:
 			let i = `control_flow_if_${t}()`;
 			return Q.set(i, () => me(e, t, n, r)), [`this.${i};`];
-		case x.For:
+		case S.For:
 			let a = `control_flow_for_${t}()`;
 			return Q.set(a, () => pe(e, t, n, r)), [`this.${a};`];
-		case x.Switch:
+		case S.Switch:
 			let o = `control_flow_switch_${t}()`;
 			return Q.set(o, () => he(e, t, n, r)), [`this.${o};`];
-		case x.ConstDeclaration: return fe(e, t, n, r);
+		case S.ConstDeclaration: return fe(e, t, n, r);
 		default: return [];
 	}
 }
 //#endregion
 //#region ../packages/compiler/src/compile.ts
 function ve(e) {
-	return _e(new z(new ae(e).tokenize()).parse());
+	return _e(new B(new ie(e).tokenize()).parse());
 }
 //#endregion
 export { ve as compile };