@mbler/mcx-core 0.1.2-rc.9 → 0.1.3-rc.2

package/dist/index.js

@@ -1,6 +1,7 @@
-import { n as __require, t as __exportAll } from "./chunk-DEq-mXcV.js";
+import { n as __require, t as __exportAll } from "./chunk-D0rfrjR5.js";
 import * as Module from "node:module";
 import { createRequire } from "node:module";
+import { NodeTypes, baseParse } from "@vue/compiler-core";
 import * as path from "node:path";
 import { extname } from "node:path";
 import * as t from "@babel/types";
@@ -16,295 +17,165 @@ import * as vm from "node:vm";
 import { Buffer } from "node:buffer";
 import { existsSync, readFileSync } from "node:fs";
 import { styleText } from "node:util";
-import { BlockComponent, BlockComponent as BlockComponent$1, EntityComponent, EntityComponent as EntityComponent$1, GIFImageComponent, GIFImageComponent as GIFImageComponent$1, ItemComponent, ItemComponent as ItemComponent$1, JPGImageComponent, JPGImageComponent as JPGImageComponent$1, PNGImageComponent, PNGImageComponent as PNGImageComponent$1, SVGImageComponent, SVGImageComponent as SVGImageComponent$1 } from "@mbler/mcx-component";
 import MagicString from "magic-string";
+
 //#region src/ast/tag.ts
-function createPos(line, column) {
+function getExpressionContent(expr) {
+	return expr?.content ?? "true";
+}
+/** Convert absolute character offset in source to MCX position (line: 1-indexed, column: 0-indexed) */
+function absOffsetToMCXPos(source, absOffset) {
+	let line = 1;
+	let col = 0;
+	const len = Math.min(absOffset, source.length);
+	for (let i = 0; i < len; i++) if (source.charCodeAt(i) === 10) {
+		line++;
+		col = 0;
+	} else col++;
 	return {
 		line,
-		column
+		column: col
 	};
 }
-var Tokenizer = class {
-	text;
-	constructor(text) {
-		this.text = text;
-	}
-	*splitTokens() {
-		const text = this.text;
-		let i = 0;
-		let line = 1;
-		let column = 0;
-		const len = text.length;
-		while (i < len) if (text[i] === "<") {
-			if (text.startsWith("!--", i + 1)) {
-				const commentStart = i;
-				const tokenStartLine = line;
-				const tokenStartColumn = column;
-				const endIdx = text.indexOf("-->", i + 4);
-				const commentEnd = endIdx === -1 ? len - 1 : endIdx + 2;
-				for (let j = i; j <= commentEnd; j++) if (text[j] === "\n") {
-					line++;
-					column = 0;
-				} else column++;
-				yield {
-					data: text.slice(commentStart, commentEnd + 1),
-					type: "Comment",
-					start: createPos(tokenStartLine, tokenStartColumn),
-					end: createPos(line, column)
-				};
-				i = commentEnd + 1;
-				if (i < len && text[i] === ">") column++;
-				continue;
-			}
-			const tokenStart = i;
-			const tokenStartLine = line;
-			const tokenStartColumn = column;
-			let j = i + 1;
-			let sawGt = false;
-			for (; j < len; j++) {
-				const c = text[j];
-				if (c === ">") {
-					sawGt = true;
-					break;
-				}
-				if (c === "\n") {
-					line++;
-					column = 0;
-				} else column++;
-			}
-			const buffer = text.slice(tokenStart, sawGt ? j + 1 : len);
-			yield {
-				data: buffer,
-				type: buffer.startsWith("</") ? "TagEnd" : "Tag",
-				start: createPos(tokenStartLine, tokenStartColumn),
-				end: createPos(line, column)
-			};
-			i = sawGt ? j + 1 : len;
-			if (sawGt) column++;
-		} else {
-			const contentStart = i;
-			const contentStartLine = line;
-			const contentStartColumn = column;
-			let j = i;
-			for (; j < len; j++) {
-				const c = text[j];
-				if (c === "<") break;
-				if (c === "\n") {
-					line++;
-					column = 0;
-				} else column++;
-			}
-			yield {
-				data: text.slice(contentStart, j),
-				type: "Content",
-				start: createPos(contentStartLine, contentStartColumn),
-				end: createPos(line, j > contentStart ? column - 1 : column)
-			};
-			i = j;
-		}
-	}
-};
-var Lexer$1 = class {
+var McxAst = class McxAst {
 	text;
 	includeComments;
-	booleanProxyCache;
 	constructor(text, includeComments = false) {
 		this.text = text;
 		this.includeComments = includeComments;
-		this.booleanProxyCache = /* @__PURE__ */ new WeakMap();
 	}
-	*tokenStream() {
-		const tokenizer = new Tokenizer(this.text);
-		for (const token of Array.from(tokenizer.splitTokens())) {
-			if (!this.includeComments && token.type === "Comment") continue;
-			yield token;
+	parseAST() {
+		const ast = baseParse(this.text, {
+			comments: true,
+			whitespace: "preserve"
+		});
+		const result = [];
+		for (const child of ast.children) {
+			const node = this.convertTemplateChild(child);
+			if (node && node.type === "TagNode") result.push(node);
 		}
+		return result;
 	}
-	/**
-	* 生成 Token 迭代器，用于遍历所有结构化 Token
-	*/
-	*tokenIterator() {
-		yield* this.tokenStream();
-	}
-	get tokens() {
-		return { [Symbol.iterator]: () => this.tokenIterator() };
-	}
-	/**
-	* 创建一个动态布尔属性访问的 Proxy（可选功能）
-	*/
-	getBooleanCheckProxy() {
-		if (!this.booleanProxyCache.has(this)) {
-			const charMap = /* @__PURE__ */ new Map();
-			const proxy = new Proxy({}, {
-				get(_, prop) {
-					if (typeof prop !== "string") return false;
-					return charMap.get(prop) || false;
-				},
-				set(_, prop, value) {
-					if (typeof prop !== "string") return false;
-					charMap.set(prop, Boolean(value));
-					return true;
+	convertTemplateChild(node) {
+		if (node.type === NodeTypes.ELEMENT) return this.convertVueElement(node);
+		if (node.type === NodeTypes.TEXT) {
+			const textNode = node;
+			if (textNode.content.trim()) return {
+				data: textNode.content,
+				type: "TagContent"
+			};
+			return null;
+		}
+		if (node.type === NodeTypes.INTERPOLATION) return {
+			data: `{{ ${getExpressionContent(node.content)} }}`,
+			type: "TagContent"
+		};
+		if (this.includeComments && node.type === NodeTypes.COMMENT) {
+			const commentNode = node;
+			return {
+				data: commentNode.content,
+				type: "Comment",
+				loc: {
+					start: {
+						line: commentNode.loc.start.line,
+						column: commentNode.loc.start.column
+					},
+					end: {
+						line: commentNode.loc.end.line,
+						column: commentNode.loc.end.column
+					}
 				}
-			});
-			this.booleanProxyCache.set(this, proxy);
+			};
 		}
-		return this.booleanProxyCache.get(this);
-	}
-};
-/** Parser - 负责将Token流解析为AST */
-var Parser$1 = class {
-	lexer;
-	constructor(lexer) {
-		this.lexer = lexer;
+		return null;
 	}
-	/**
-	* 解析标签属性，如：<div id="app" disabled />
-	*/
-	parseAttributes(tagContent) {
-		const attributes = {};
-		let currentKey = "";
-		let currentValue = "";
-		let inKey = true;
-		let name = "";
-		let inValue = false;
-		let quoteChar = null;
-		let isTagName = true;
-		for (let i = 0; i < tagContent.length; i++) {
-			const char = tagContent[i];
-			if (isTagName) {
-				if (char === " " || char === ">") {
-					name = currentKey.trim();
-					currentKey = "";
-					isTagName = false;
-					if (char === ">") break;
-				} else currentKey += char;
-				continue;
+	convertVueElement(node) {
+		const attrs = {};
+		for (const prop of node.props) if (prop.type === NodeTypes.ATTRIBUTE) {
+			const attr = prop;
+			attrs[attr.name] = attr.value?.content ?? "true";
+		} else if (prop.type === NodeTypes.DIRECTIVE) {
+			const dir = prop;
+			if (dir.name === "bind") {
+				const key = `:${getExpressionContent(dir.arg)}`;
+				attrs[key] = getExpressionContent(dir.exp);
+			} else if (dir.name === "on") {
+				const key = `@${getExpressionContent(dir.arg)}`;
+				attrs[key] = "true";
 			}
-			if (inValue) if (char === quoteChar && (currentValue.length === 0 || currentValue[currentValue.length - 1] !== "\\")) {
-				attributes[currentKey.trim()] = currentValue;
-				currentKey = "";
-				currentValue = "";
-				inKey = true;
-				inValue = false;
-				quoteChar = null;
-			} else currentValue += char;
-			else if (char === "=" && inKey) {
-				inKey = false;
-				inValue = true;
-				const nextIndex = i + 1;
-				const nextChar = nextIndex < tagContent.length ? tagContent[nextIndex] : " ";
-				if (nextChar === "\"" || nextChar === "'") {
-					quoteChar = nextChar;
-					i = nextIndex;
-				} else quoteChar = " ";
-			} else if (char === " " && inKey && currentKey) {
-				attributes[currentKey.trim()] = "true";
-				currentKey = "";
-			} else if (inKey) currentKey += char;
 		}
-		if (isTagName) name = currentKey.trim();
-		else if (currentKey) attributes[currentKey.trim()] = inValue ? currentValue.replace(/^["']/, "").replace(/["']$/, "") : "true";
-		return {
-			name,
-			arr: attributes
-		};
-	}
-	/**
-	* 基于stack的解析以支持嵌套，并为ParsedTagNode添加loc: { start, end }
-	* Content和Comment改为递归节点数组 (ParsedTagContentNode | ParsedCommentNode | ParsedTagNode)[]
-	*/
-	*parseAST() {
-		const rawTokens = Array.from(this.lexer.tokenStream());
-		const root = [];
-		const stack = [];
-		for (let idx = 0; idx < rawTokens.length; idx++) {
-			const token = rawTokens[idx];
-			if (!token) continue;
-			if (token.type === "Content") {
-				const contentNode = {
-					data: token.data,
-					type: "TagContent"
-				};
-				if (stack.length > 0) stack[stack.length - 1].content.push(contentNode);
-				else root.push(contentNode);
-			} else if (token.type === "Comment") {
-				const commentNode = {
-					data: token.data,
-					type: "Comment",
-					loc: {
-						start: { ...token.start },
-						end: { ...token.end }
-					}
-				};
-				if (stack.length > 0) stack[stack.length - 1].content.push(commentNode);
-				else root.push(commentNode);
-			} else if (token.type === "Tag") {
-				const inner = token.data.slice(1, -1).trim();
-				const isSelfClosing = inner.endsWith("/");
-				const arr = this.parseAttributes(isSelfClosing ? inner.slice(0, -1).trim() : inner);
-				const node = {
-					start: token,
-					name: arr.name,
-					arr: arr.arr,
-					content: [],
-					end: null,
-					type: "TagNode",
-					loc: {
-						start: { ...token.start },
-						end: { ...token.end }
-					}
-				};
-				if (isSelfClosing) if (stack.length > 0) stack[stack.length - 1].content.push(node);
-				else yield node;
-				else stack.push(node);
-			} else if (token.type === "TagEnd") {
-				const name = token.data.replace(/^<\/\s*/, "").replace(/\s*>$/, "").trim();
-				for (let s = stack.length - 1; s >= 0; s--) {
-					const candidate = stack[s];
-					if (candidate && candidate.name === name) {
-						candidate.end = token;
-						candidate.loc.end = { ...token.end };
-						stack.splice(s, 1);
-						if (stack.length > 0) stack[stack.length - 1].content.push(candidate);
-						else yield candidate;
-						break;
-					}
+		const children = this.convertVueChildren(node.children);
+		const fullSource = this.text;
+		const baseOffset = node.loc.start.offset;
+		const elementSource = node.loc.source;
+		let openEnd = elementSource.length;
+		let inQuote = null;
+		for (let i = 0; i < elementSource.length; i++) {
+			const c = elementSource[i];
+			if (inQuote) {
+				if (c === "\\") {
+					i++;
+					continue;
 				}
+				if (c === inQuote) inQuote = null;
+			} else if (c === "\"" || c === "'") inQuote = c;
+			else if (c === ">") {
+				openEnd = i + 1;
+				break;
 			}
 		}
-		while (stack.length > 0) {
-			const node = stack.shift();
-			if (stack.length > 0) stack[0].content.push(node);
-			else yield node;
+		let closeStart = -1;
+		if (!node.isSelfClosing) {
+			for (let i = elementSource.length - 2; i >= 0; i--) if (elementSource[i] === "<" && elementSource[i + 1] === "/") {
+				closeStart = i;
+				break;
+			}
 		}
+		const openTagStartAbs = baseOffset;
+		const openTagEndAbs = baseOffset + openEnd;
+		let endToken = null;
+		if (closeStart >= 0) {
+			const closeTagStartAbs = baseOffset + closeStart;
+			const closeTagEndAbs = baseOffset + elementSource.length;
+			endToken = {
+				data: elementSource.slice(closeStart),
+				type: "TagEnd",
+				start: absOffsetToMCXPos(fullSource, closeTagStartAbs),
+				end: absOffsetToMCXPos(fullSource, closeTagEndAbs)
+			};
+		}
+		return {
+			start: {
+				data: elementSource.slice(0, openEnd),
+				type: "Tag",
+				start: absOffsetToMCXPos(fullSource, openTagStartAbs),
+				end: absOffsetToMCXPos(fullSource, openTagEndAbs)
+			},
+			name: node.tag,
+			arr: attrs,
+			content: children,
+			end: endToken,
+			loc: {
+				start: {
+					line: node.loc.start.line,
+					column: node.loc.start.column
+				},
+				end: {
+					line: node.loc.end.line,
+					column: node.loc.end.column
+				}
+			},
+			type: "TagNode"
+		};
 	}
-	get ast() {
-		return { [Symbol.iterator]: () => this.parseAST() };
-	}
-};
-var McxAst = class McxAst {
-	text;
-	includeComments;
-	constructor(text, includeComments = false) {
-		this.text = text;
-		this.includeComments = includeComments;
-	}
-	getAST() {
-		const parser = new Parser$1(new Lexer$1(this.text, this.includeComments));
-		return Array.from(parser.parseAST());
-	}
-	get data() {
-		return this.getAST();
-	}
-	parseAST() {
-		return this.getAST();
+	convertVueChildren(children) {
+		const result = [];
+		for (const child of children) {
+			const node = this.convertTemplateChild(child);
+			if (node) result.push(node);
+		}
+		return result;
 	}
-	/**
-	* 生成代码字符串
-	* @param node 代码的AST节点
-	* @returns 代码字符串
-	*/
 	static generateCode(node) {
 		let code = `<${node.name}`;
 		for (const [key, value] of Object.entries(node.arr || {})) if (value === "true") code += ` ${key}`;
@@ -312,6 +183,7 @@ var McxAst = class McxAst {
 		code += ">";
 		const contentArr = node.content;
 		if (Array.isArray(contentArr)) for (const item of contentArr) if (item.type === "TagContent") code += item.data;
+		else if (item.type === "Comment") code += item.data;
 		else code += McxAst.generateCode(item);
 		code += `</${node.name}>`;
 		return code;
@@ -330,31 +202,32 @@ var MCXUtils = class MCXUtils {
 	static isAttributeMap(obj) {
 		return !!obj && typeof obj === "object" && !Array.isArray(obj);
 	}
-	static isToken(obj) {
-		return !!obj && typeof obj === "object" && "data" in obj && "type" in obj && "start" in obj && "end" in obj && (obj.type === "Tag" || obj.type === "TagEnd" || obj.type === "Content" || obj.type === "Comment");
+	static isParseNode(node) {
+		return Array.isArray(node) && node.every(MCXUtils.isTagNode);
 	}
-	static isTagToken(obj) {
-		return MCXUtils.isToken(obj) && obj.type === "Tag";
+	static isToken(_obj) {
+		return false;
 	}
-	static isTagEndToken(obj) {
-		return MCXUtils.isToken(obj) && obj.type === "TagEnd";
+	static isTagToken(_obj) {
+		return false;
 	}
-	static isContentToken(obj) {
-		return MCXUtils.isToken(obj) && obj.type === "Content";
+	static isTagEndToken(_obj) {
+		return false;
 	}
-	static isCommentToken(obj) {
-		return MCXUtils.isToken(obj) && obj.type === "Comment";
+	static isContentToken(_obj) {
+		return false;
 	}
-	static isBaseToken(obj) {
-		return !!obj && typeof obj === "object" && "data" in obj && "type" in obj && "start" in obj && "end" in obj;
+	static isCommentToken(_obj) {
+		return false;
 	}
-	static isTokenType(value) {
-		return value === "Tag" || value === "TagEnd" || value === "Content" || value === "Comment";
+	static isBaseToken(_obj) {
+		return false;
 	}
-	static isParseNode(node) {
-		return Array.isArray(node) && node.every(MCXUtils.isTagNode);
+	static isTokenType(_value) {
+		return false;
 	}
 };
+
 //#endregion
 //#region src/ast/prop.ts
 const STATUS = [0, 1];
@@ -404,12 +277,14 @@ function PropParser(code) {
 	const lexer = new Lexer(code);
 	return Array.from(lexer.tokenize());
 }
+
 //#endregion
 //#region src/ast/index.ts
 var ast_default = {
 	tag: McxAst,
 	prop: PropParser
 };
+
 //#endregion
 //#region src/compile-mcx/types.ts
 const _MCXstructureLocComponentTypes = {
@@ -417,6 +292,7 @@ const _MCXstructureLocComponentTypes = {
 	blocks: "block",
 	entities: "entity"
 };
+
 //#endregion
 //#region src/compile-mcx/compiler/compileData.ts
 var JsCompileData = class {
@@ -449,6 +325,7 @@ var MCXCompileData = class {
 		this.File = dir;
 	}
 };
+
 //#endregion
 //#region src/compile-mcx/compiler/utils.ts
 var Utils$1 = class Utils$1 {
@@ -525,6 +402,7 @@ var Utils$1 = class Utils$1 {
 		};
 	}
 };
+
 //#endregion
 //#region src/compile-mcx/compiler/index.ts
 var compiler_exports = /* @__PURE__ */ __exportAll({
@@ -724,7 +602,8 @@ var CompileMCX = class {
 			isLoad: false
 		},
 		Component: {},
-		UI: null
+		UI: null,
+		Form: null
 	};
 	getCompileData() {
 		return this.CompileData;
@@ -756,6 +635,7 @@ var CompileMCX = class {
 			script: "",
 			Event: null,
 			ui: null,
+			form: null,
 			Component: {}
 		};
 		for (const node of this.mcxCode || []) {
@@ -781,6 +661,9 @@ var CompileMCX = class {
 			} else if (node.name == "Ui") {
 				if (component || temp.Event || temp.ui) throw makeError("[compile error]: UI node can't use with component or event or other ui node", node);
 				temp.ui = node;
+			} else if (node.name == "Form") {
+				if (component || temp.Event || temp.form || temp.ui) throw makeError("[compile error]: Form node can't use with component, event, Ui, or other Form node", node);
+				temp.form = node;
 			}
 		}
 		if (!temp.script) throw makeError("[compile error]: mcx must has a script");
@@ -803,6 +686,7 @@ var CompileMCX = class {
 			this.handlerChildComponent(subNode);
 		}
 		if (temp.ui) this.tempLoc.UI = temp.ui;
+		if (temp.form) this.tempLoc.Form = temp.form;
 	}
 	handlerChildComponent(node) {
 		const name = node.name;
@@ -868,6 +752,7 @@ const compileMCXFn = ((mcxCode) => {
 });
 compileJSFn.cache = {};
 compileMCXFn.cache = {};
+
 //#endregion
 //#region src/transforms/config.ts
 var config_default = {
@@ -877,6 +762,7 @@ var config_default = {
 	eventExtendsName: "McxExtendsBy",
 	paramCtx: "__mcx__ctx"
 };
+
 //#endregion
 //#region src/utils.ts
 var Utils = class Utils {
@@ -925,12 +811,14 @@ var Utils = class Utils {
 		return path.isAbsolute(inputPath) ? inputPath : path.join(baseDir, inputPath);
 	}
 };
+
 //#endregion
 //#region src/transforms/file_id.ts
 let fileIdCounter = 0;
 function generateFileId() {
 	return `__file_import_${fileIdCounter++}__`;
 }
+
 //#endregion
 //#region src/transforms/utils.ts
 function extractVarDefIdList(express) {
@@ -1049,110 +937,328 @@ function _enableWithData() {
 	fn.prototype.enable = d;
 	return fn;
 }
+function processDefineProp(code, mode, impBody) {
+	const obsMap = {};
+	for (const stmt of code.node.body) if (t.isVariableDeclaration(stmt)) {
+		for (const decl of stmt.declarations) if (t.isCallExpression(decl.init) && t.isIdentifier(decl.init.callee) && decl.init.callee.name === "defineProp" && t.isIdentifier(decl.id)) {
+			const varName = decl.id.name;
+			const defaultVal = decl.init.arguments[1] || decl.init.arguments[0];
+			let defaultExpr = t.nullLiteral();
+			if (defaultVal && t.isExpression(defaultVal)) defaultExpr = defaultVal;
+			const propAccess = t.logicalExpression("??", t.memberExpression(t.memberExpression(t.identifier("__mcx__ctx"), t.identifier("$prop")), t.identifier(varName)), defaultExpr);
+			if (mode === "ui") {
+				const obsType = inferObservableType(defaultExpr);
+				if (obsType) {
+					obsMap[obsType] = obsType;
+					decl.init = t.newExpression(t.identifier(obsType), [propAccess]);
+				} else decl.init = propAccess;
+			} else decl.init = propAccess;
+		}
+	}
+	if (mode === "ui" && Object.keys(obsMap).length > 0) impBody.push(t.importDeclaration(Object.values(obsMap).map((name) => t.importSpecifier(t.identifier(name), t.identifier(name))), t.stringLiteral("@minecraft/server-ui")));
+}
+function inferObservableType(expr) {
+	if (t.isStringLiteral(expr)) return "ObservableString";
+	if (t.isBooleanLiteral(expr)) return "ObservableBoolean";
+	if (t.isNumericLiteral(expr)) return "ObservableNumber";
+	if (t.isNullLiteral(expr)) return "ObservableString";
+	if (t.isIdentifier(expr) && expr.name === "undefined") return "ObservableString";
+	return null;
+}
+function collectSetupDeclarations(code, existingReturnMembers) {
+	const result = [];
+	const seen = new Set(existingReturnMembers);
+	for (const stmt of code.node.body) {
+		if (!t.isDeclaration(stmt)) continue;
+		const ids = extractIdList(stmt);
+		for (const id of ids) if (id && !seen.has(id)) {
+			seen.add(id);
+			result.push(t.objectProperty(t.identifier(id), t.identifier(id)));
+		}
+	}
+	return result;
+}
+function processHooks(code) {
+	let startup = null;
+	let mounted = null;
+	const toRemove = [];
+	for (let i = 0; i < code.node.body.length; i++) {
+		const stmt = code.node.body[i];
+		if (!stmt) continue;
+		if (t.isExpressionStatement(stmt) && t.isCallExpression(stmt.expression)) {
+			const call = stmt.expression;
+			if (t.isIdentifier(call.callee)) {
+				const name = call.callee.name;
+				if (name === "onStartup" || name === "onMounted") {
+					if (call.arguments.length > 0) {
+						const cb = call.arguments[0];
+						if (t.isExpression(cb)) if (name === "onStartup") startup = cb;
+						else mounted = cb;
+					}
+					toRemove.push(i);
+				}
+			}
+		}
+	}
+	for (const idx of toRemove.reverse()) code.node.body.splice(idx, 1);
+	const hookNames = new Set(["onStartup", "onMounted"]);
+	for (const imp of code.BuildCache.import) if (imp.source === "@mbler/mcx") imp.imported = imp.imported.filter((item) => !hookNames.has(item.import || item.as));
+	code.BuildCache.import = code.BuildCache.import.filter((imp) => imp.source !== "@mbler/mcx" || imp.imported.length > 0);
+	return {
+		startup,
+		mounted
+	};
+}
+
 //#endregion
-//#region src/transforms/transform/ui.ts
-async function Comp$2(ctx) {
+//#region src/transforms/transform/layout.ts
+/**
+* Shared layout generation for both <Form> and <Ui>.
+* Generates layout config with (s) => expr functions for content and params.
+*/
+function generateLayout(ctx, tagNode, tagName, mode) {
 	const internalCtx = ctx.ctx;
-	ctx.impBody.push(t.importDeclaration([t.importSpecifier(t.identifier("__mcx__ui"), t.identifier("ui"))], t.stringLiteral("@mbler/mcx")), t.importDeclaration([t.importNamespaceSpecifier(t.identifier("__minecraft__ui"))], t.stringLiteral("@minecraft/server-ui")));
-	const uiTagNode = ctx.ctx.compiledCode.strLoc.UI;
-	if (!uiTagNode || uiTagNode?.name !== "Ui") throw new Error("[UI Component]: why didn't parent compeled verify?");
-	let MCXUIType = null;
-	const UITree = [];
-	for (const uiClientTag of uiTagNode.content) if (uiClientTag.type == "TagNode") {
-		if (uiClientTag.content.some((i) => i.type == "TagNode")) internalCtx.rollupContext.error("[UI]: can't support ui client element", uiClientTag.loc ? {
-			column: uiClientTag.loc.start.column,
-			line: uiClientTag.loc.start.line
+	const parsedObj = [];
+	const typeTags = [];
+	const elements = [];
+	for (const child of tagNode.content) {
+		if (child.type !== "TagNode") continue;
+		if (child.content.some((i) => i.type === "TagNode")) internalCtx.rollupContext.error(`[${tagName}]: can't support nested elements`, child.loc ? {
+			column: child.loc.start.column,
+			line: child.loc.start.line
 		} : void 0);
 		let _for;
-		if (typeof uiClientTag.arr.for === "string") {
-			const match = uiClientTag.arr.for.match(/^(\w+)\s+in\s+(\w+)$/);
+		if (typeof child.arr.for === "string") {
+			const match = child.arr.for.match(/^(\w+)\s+in\s+(\w+)$/);
 			if (match) _for = {
 				variable: match[1],
-				useProp: match[2]
+				useSetup: match[2]
 			};
-			else internalCtx.rollupContext.error("[UI]: invalid for syntax, expected 'variable in propName'", uiClientTag.loc ? {
-				column: uiClientTag.loc.start.column,
-				line: uiClientTag.loc.start.line
+			else internalCtx.rollupContext.error(`[${tagName}]: invalid for syntax, expected 'variable in propName'`, child.loc ? {
+				column: child.loc.start.column,
+				line: child.loc.start.line
 			} : void 0);
 		}
-		UITree.push({
-			arr: uiClientTag.arr,
-			content: uiClientTag.content.map((i) => i.type == "TagContent" && i.data || "").join(""),
-			type: uiClientTag.name,
-			loc: uiClientTag.loc,
-			for: _for
+		let _if;
+		if (typeof child.arr.if === "string") _if = { useSetup: child.arr.if };
+		elements.push({
+			arr: child.arr,
+			content: child.content.map((i) => i.type === "TagContent" && i.data || "").join(""),
+			type: child.name,
+			loc: child.loc,
+			..._for ? { for: _for } : {},
+			..._if ? { if: _if } : {}
 		});
 	}
-	const parsedObj = [];
-	function pushToTree(name, params, content, _for) {
+	for (const el of elements) {
+		const name = el.type;
+		const cleanedArr = { ...el.arr };
+		delete cleanedArr.for;
+		delete cleanedArr.if;
+		const formType = detectFormType(name);
+		if (formType === "invalid") {
+			internalCtx.rollupContext.error(`[${tagName}]: don't support tag: ${name}`, el.loc ? {
+				line: el.loc.start.line,
+				column: el.loc.start.column
+			} : void 0);
+			continue;
+		}
+		if (formType) typeTags.push(formType);
+		const paramsObj = t.objectExpression(Object.entries(cleanedArr).filter(([key]) => key !== "for" && key !== "if").map(([key, value]) => {
+			const isDynamic = key.startsWith(":");
+			const paramName = isDynamic ? key.slice(1) : key;
+			if (paramName === "click") return t.objectProperty(t.identifier(paramName), simpleFn(String(value)));
+			return t.objectProperty(t.identifier(paramName), isDynamic ? simpleFn(String(value)) : typeof value === "boolean" ? t.booleanLiteral(value) : t.stringLiteral(value));
+		}));
+		const contentExpr = parseContent(el.content);
 		const props = [
 			t.objectProperty(t.identifier("type"), t.stringLiteral(name)),
-			t.objectProperty(t.identifier("params"), t.objectExpression(Object.entries(params).map(([key, value]) => {
-				const isDynamic = key.startsWith(":");
-				const paramName = isDynamic ? key.slice(1) : key;
-				return t.objectProperty(t.identifier(paramName), isDynamic ? t.objectExpression([t.objectProperty(t.identifier("useProp"), t.stringLiteral(String(value)))]) : typeof value == "boolean" ? t.booleanLiteral(value) : t.stringLiteral(value));
-			}))),
-			t.objectProperty(t.identifier("content"), content.startsWith("{{ ") && content.endsWith(" }}") ? t.objectExpression([t.objectProperty(t.identifier("useProp"), t.stringLiteral(content.slice(3, content.length - 3).trim()))]) : t.stringLiteral(content))
+			t.objectProperty(t.identifier("params"), paramsObj),
+			t.objectProperty(t.identifier("content"), contentExpr)
 		];
-		if (_for) props.push(t.objectProperty(t.identifier("for"), t.objectExpression([t.objectProperty(t.identifier("variable"), t.stringLiteral(_for.variable)), t.objectProperty(t.identifier("useProp"), t.stringLiteral(_for.useProp))])));
+		if (el.for) props.push(t.objectProperty(t.identifier("for"), t.objectExpression([t.objectProperty(t.identifier("variable"), t.stringLiteral(el.for.variable)), t.objectProperty(t.identifier("useSetup"), t.stringLiteral(el.for.useSetup))])));
+		if (el.if) props.push(t.objectProperty(t.identifier("if"), t.objectExpression([t.objectProperty(t.identifier("useSetup"), t.stringLiteral(el.if.useSetup))])));
 		parsedObj.push(t.objectExpression(props));
 	}
-	for (const tp of UITree) {
-		const name = tp.type;
-		const cleanedArr = { ...tp.arr };
-		delete cleanedArr.for;
-		if ([
-			"input",
-			"dropdown",
-			"submit",
-			"toggle",
-			"slider"
-		].includes(name)) {
-			if (MCXUIType && MCXUIType !== "ModalFormData") internalCtx.rollupContext.error("[UI]: a mcx can't have a ModalFormData Node and other form tag", tp.loc ? {
-				line: tp.loc.start.line,
-				column: tp.loc.start.column
-			} : void 0);
-			MCXUIType = "ModalFormData";
-			pushToTree(name, cleanedArr, tp.content, tp.for);
-		} else if (["button-m"].includes(name)) {
-			if (MCXUIType && MCXUIType !== "MessageFormData") internalCtx.rollupContext.error("[UI]: ", tp.loc ? {
-				line: tp.loc.start.line,
-				column: tp.loc.start.column
-			} : void 0);
-			MCXUIType = "MessageFormData";
-			pushToTree(name, cleanedArr, tp.content, tp.for);
-		} else if ([
-			"body",
-			"divider",
-			"title",
-			"label"
-		].includes(name)) pushToTree(name, cleanedArr, tp.content, tp.for);
-		else if (name == "button") {
-			if (MCXUIType !== "ActionFormData" && MCXUIType) internalCtx.rollupContext.error("[UI]: don't support use button for messageFormData", tp.loc ? {
-				line: tp.loc.start.line,
-				column: tp.loc.start.column
-			} : void 0);
-			pushToTree(name, cleanedArr, tp.content, tp.for);
-			MCXUIType = "ActionFormData";
-		} else internalCtx.rollupContext.error("[UI]: don't support tag: " + name, tp.loc ? {
-			line: tp.loc.start.line,
-			column: tp.loc.start.column
-		} : void 0);
+	let formTypeStr = "ActionFormData";
+	if (typeTags.some((t) => [
+		"input",
+		"dropdown",
+		"submit",
+		"toggle",
+		"slider"
+	].includes(t))) formTypeStr = "ModalFormData";
+	else if (typeTags.some((t) => t === "button-m")) formTypeStr = "MessageFormData";
+	else if (typeTags.some((t) => t === "button")) formTypeStr = "ActionFormData";
+	return {
+		parsedObj,
+		formTypeStr
+	};
+}
+function detectFormType(tag) {
+	if ([
+		"input",
+		"dropdown",
+		"submit",
+		"toggle",
+		"slider"
+	].includes(tag)) return "modal";
+	if (tag === "button-m") return "message";
+	if (tag === "button") return "action";
+	if ([
+		"body",
+		"divider",
+		"title",
+		"label",
+		"header",
+		"spacer",
+		"close-button"
+	].includes(tag)) return "shared";
+	return "invalid";
+}
+/** Simple arrow function for params (non-reactive): (ctx) => ctx[0].a.b.c */
+function simpleFn(expr) {
+	const ctx = t.identifier("ctx");
+	const body = dotAccess(expr, ctx);
+	return t.arrowFunctionExpression([ctx], body);
+}
+/** Extract root identifiers from an expression for dependency tracking */
+function extractIdentifiers(expr) {
+	const reserved = new Set([
+		"true",
+		"false",
+		"null",
+		"undefined",
+		"this",
+		"new",
+		"typeof",
+		"instanceof"
+	]);
+	const ids = /* @__PURE__ */ new Set();
+	const regex = /\b([a-zA-Z_$][\w$]*)\b/g;
+	let m;
+	while ((m = regex.exec(expr)) !== null) if (!reserved.has(m[1])) ids.add(m[1]);
+	return [...ids];
+}
+/** Generate new Computation((ctx) => expr, [deps]) */
+function arrowFn(expr) {
+	const ctx = t.identifier("ctx");
+	const body = dotAccess(expr, ctx);
+	const evalFn = t.arrowFunctionExpression([ctx], body);
+	const deps = extractIdentifiers(expr).map((id) => {
+		const c = t.identifier("ctx");
+		return t.arrowFunctionExpression([c], dotAccess(id, c));
+	});
+	return t.newExpression(t.identifier("Computation"), [evalFn, t.arrayExpression(deps)]);
+}
+/**
+* Parse content string, returns:
+* - t.stringLiteral for pure static text
+* - t.NewExpression (Computation) for content with {{ }} interpolation
+*
+* Supports:
+* - "Hello" → "Hello"
+* - "{{ a }}" → new Computation((ctx) => ctx[0].a, [ctx => ctx[0].a])
+* - "Hi {{ a }}" → new Computation((ctx) => `Hi ${ctx[0].a}`, [ctx => ctx[0].a])
+* - "{{ a.slice(1,2) }}" → new Computation((ctx) => ctx[0].a.slice(1,2), [ctx => ctx[0].a])
+*/
+function parseContent(raw) {
+	if (!raw.includes("{{ ")) return t.stringLiteral(raw);
+	const parts = splitInterpolation(raw);
+	if (parts.length === 1 && parts[0].type === "expr") return arrowFn(parts[0].value);
+	const ctx = t.identifier("ctx");
+	const quasis = [];
+	const expressions = [];
+	const allIds = /* @__PURE__ */ new Set();
+	for (const part of parts) if (part.type === "text") quasis.push(t.templateElement({
+		raw: part.value,
+		cooked: part.value
+	}));
+	else {
+		expressions.push(dotAccess(part.value, ctx));
+		for (const id of extractIdentifiers(part.value)) allIds.add(id);
+	}
+	quasis.push(t.templateElement({
+		raw: "",
+		cooked: ""
+	}, true));
+	const tpl = t.templateLiteral(quasis, expressions);
+	const evalFn = t.arrowFunctionExpression([ctx], tpl);
+	const deps = [...allIds].map((id) => {
+		const c = t.identifier("ctx");
+		return t.arrowFunctionExpression([c], dotAccess(id, c));
+	});
+	return t.newExpression(t.identifier("Computation"), [evalFn, t.arrayExpression(deps)]);
+}
+function splitInterpolation(raw) {
+	const result = [];
+	const regex = /\{\{\s*(.*?)\s*\}\}/g;
+	let lastIndex = 0;
+	let match;
+	while ((match = regex.exec(raw)) !== null) {
+		if (match.index > lastIndex) result.push({
+			type: "text",
+			value: raw.slice(lastIndex, match.index)
+		});
+		result.push({
+			type: "expr",
+			value: match[1]
+		});
+		lastIndex = regex.lastIndex;
 	}
-	if (!MCXUIType) MCXUIType = "ActionFormData";
-	const finallyData = t.objectExpression([
+	if (lastIndex < raw.length) result.push({
+		type: "text",
+		value: raw.slice(lastIndex)
+	});
+	return result;
+}
+/** "a.b.c" → __ctx[0].a.b.c */
+function dotAccess(expr, root) {
+	const parts = expr.split(".");
+	let node = t.memberExpression(root, t.numericLiteral(0), true);
+	for (const part of parts) node = t.memberExpression(node, t.identifier(part));
+	return node;
+}
+
+//#endregion
+//#region src/transforms/transform/ui.ts
+async function Comp$3(ctx) {
+	ctx.impBody.push(t.importDeclaration([t.importSpecifier(t.identifier("__mcx__ui"), t.identifier("ui"))], t.stringLiteral("@mbler/mcx")), t.importDeclaration([t.importNamespaceSpecifier(t.identifier("__minecraft__ui"))], t.stringLiteral("@minecraft/server-ui")));
+	const tagNode = ctx.ctx.compiledCode.strLoc.UI;
+	if (!tagNode || tagNode.name !== "Ui") throw new Error("[UI Component]: why did parent not verify?");
+	const { parsedObj, formTypeStr } = generateLayout(ctx, tagNode, "Ui", "ui");
+	const configObj = t.objectExpression([
+		t.objectProperty(t.identifier("mode"), t.stringLiteral("ui")),
+		t.objectProperty(t.identifier("layout"), t.arrayExpression(parsedObj)),
+		t.objectProperty(t.identifier("use"), t.memberExpression(t.identifier("__minecraft__ui"), t.identifier(formTypeStr))),
+		t.objectProperty(t.identifier("UI"), t.identifier("__minecraft__ui"))
+	]);
+	ctx.app([t.objectProperty(t.identifier("ui"), t.newExpression(t.identifier("__mcx__ui"), [configObj, t.identifier(config_default.scriptCompileFn)]))]);
+}
+
+//#endregion
+//#region src/transforms/transform/form.ts
+async function Comp$2(ctx) {
+	ctx.impBody.push(t.importDeclaration([t.importSpecifier(t.identifier("__mcx__ui"), t.identifier("ui"))], t.stringLiteral("@mbler/mcx")), t.importDeclaration([t.importNamespaceSpecifier(t.identifier("__minecraft__ui"))], t.stringLiteral("@minecraft/server-ui")));
+	const tagNode = ctx.ctx.compiledCode.strLoc.Form;
+	if (!tagNode || tagNode.name !== "Form") throw new Error("[Form Component]: why did parent not verify?");
+	const { parsedObj, formTypeStr } = generateLayout(ctx, tagNode, "Form", "form");
+	const configObj = t.objectExpression([
+		t.objectProperty(t.identifier("mode"), t.stringLiteral("form")),
 		t.objectProperty(t.identifier("layout"), t.arrayExpression(parsedObj)),
-		t.objectProperty(t.identifier("use"), t.memberExpression(t.identifier("__minecraft__ui"), t.identifier(MCXUIType))),
+		t.objectProperty(t.identifier("use"), t.memberExpression(t.identifier("__minecraft__ui"), t.identifier(formTypeStr))),
 		t.objectProperty(t.identifier("UI"), t.identifier("__minecraft__ui"))
 	]);
-	ctx.app([t.objectProperty(t.identifier("ui"), t.newExpression(t.identifier("__mcx__ui"), [finallyData, t.identifier(config_default.scriptCompileFn)]))]);
+	ctx.app([t.objectProperty(t.identifier("ui"), t.newExpression(t.identifier("__mcx__ui"), [configObj, t.identifier(config_default.scriptCompileFn)]))]);
 }
+
 //#endregion
 //#region src/transforms/transform/event.ts
 async function Comp$1(ctx) {
 	const appData = [t.objectProperty(t.identifier("event"), await generateEventConfig(ctx.ctx.compiledCode.raw.find((node) => node.name === "Event"), ctx.ctx, ctx.impBody))];
 	ctx.app(appData);
 }
+
 //#endregion
 //#region src/transforms/transform/app.ts
 async function Comp(ctx) {
@@ -1194,6 +1300,7 @@ async function Comp(ctx) {
 		ctx.app(appData);
 	}
 }
+
 //#endregion
 //#region src/mcx-component/cjsTransform.ts
 /**
@@ -1283,6 +1390,7 @@ function transformImportIRtoRequire(importIR) {
 	}
 	return define;
 }
+
 //#endregion
 //#region src/mcx-component/vm.ts
 const BLOCKED_MODULES = new Set([
@@ -1394,17 +1502,11 @@ var RunScript = class {
 	}
 	static isCanUseEsmRunVm = typeof vm.SourceTextModule == "function";
 };
+
 //#endregion
 //#region src/mcx-component/index.ts
 var mcx_component_exports = /* @__PURE__ */ __exportAll({
-	BlockComponent: () => BlockComponent$1,
-	EntityComponent: () => EntityComponent$1,
-	GIFImageComponent: () => GIFImageComponent$1,
-	ItemComponent: () => ItemComponent$1,
-	JPGImageComponent: () => JPGImageComponent$1,
-	PNGImageComponent: () => PNGImageComponent$1,
 	RunScript: () => RunScript,
-	SVGImageComponent: () => SVGImageComponent$1,
 	clearCachedOptions: () => clearCachedOptions,
 	compileComponent: () => compileComponent,
 	execESMMethod: () => execESMMethod,
@@ -1650,9 +1752,14 @@ async function compileComponent(compiledCode, ctx) {
 		await writeFile(filePoint, JSON.stringify(json, null, 2));
 	}
 }
+
 //#endregion
 //#region src/transforms/main.ts
 async function _transform(ctx) {
+	const formTag = ctx.compiledCode.strLoc.Form;
+	const uiTag = ctx.compiledCode.strLoc.UI;
+	const isSetupMode = formTag && formTag.arr.setup !== void 0 || uiTag && uiTag.arr.setup !== void 0;
+	const modeType = formTag && formTag.arr.setup !== void 0 ? "form" : uiTag && uiTag.arr.setup !== void 0 ? "ui" : null;
 	const _temp_main = generateMain(ctx.compiledCode.JSIR);
 	const mainFn = ctx.mainFn.body = _temp_main[0];
 	const prop = [];
@@ -1666,16 +1773,22 @@ async function _transform(ctx) {
 		app
 	};
 	let type = "app";
+	if (isSetupMode && modeType) processDefineProp(ctx.compiledCode.JSIR, modeType, parseCtx.impBody);
 	const enableSetup = _enable();
 	if (ctx.compiledCode.strLoc.Event.isLoad) {
 		type = "event";
 		enableSetup();
 		await Comp$1(parseCtx);
 	}
+	if (ctx.compiledCode.strLoc.Form) {
+		type = "form";
+		enableSetup();
+		await Comp$2(parseCtx);
+	}
 	if (ctx.compiledCode.strLoc.UI) {
 		type = "ui";
 		enableSetup();
-		await Comp$2(parseCtx);
+		await Comp$3(parseCtx);
 	}
 	if (Object.getOwnPropertyNames(ctx.compiledCode.strLoc.Component).length >= 1) {
 		type = "component";
@@ -1686,6 +1799,22 @@ async function _transform(ctx) {
 		enableSetup();
 		await Comp(parseCtx);
 	}
+	if (isSetupMode) {
+		const existingExportNames = /* @__PURE__ */ new Set();
+		for (const exp of ctx.compiledCode.JSIR.BuildCache.export) if (t.isExportNamedDeclaration(exp) && exp.declaration) {
+			const ids = extractIdList(exp.declaration);
+			for (const id of ids) existingExportNames.add(id);
+		}
+		for (const p of parseCtx.prop) if (t.isObjectProperty(p) && t.isIdentifier(p.key)) existingExportNames.add(p.key.name);
+		const setupDecls = collectSetupDeclarations(ctx.compiledCode.JSIR, existingExportNames);
+		const hooks = processHooks(ctx.compiledCode.JSIR);
+		const returnStmt = mainFn[mainFn.length - 1];
+		if (t.isReturnStatement(returnStmt) && t.isObjectExpression(returnStmt.argument)) {
+			returnStmt.argument.properties.push(...setupDecls);
+			if (hooks.startup) returnStmt.argument.properties.push(t.objectProperty(t.identifier("__mcx_startup"), hooks.startup));
+			if (hooks.mounted) returnStmt.argument.properties.push(t.objectProperty(t.identifier("__mcx_mounted"), hooks.mounted));
+		}
+	}
 	prop.push(t.objectProperty(t.identifier("type"), t.stringLiteral(type)));
 	if (enableSetup.prototype.enable) prop.push(t.objectProperty(t.identifier("setup"), t.identifier(config_default.scriptCompileFn)));
 	if (app.prototype.enable) prop.push(t.objectProperty(t.identifier("app"), t.objectExpression(app.prototype.enable)));
@@ -1695,6 +1824,7 @@ async function _transform(ctx) {
 		t.exportDefaultDeclaration(t.objectExpression(prop))
 	])).code;
 }
+
 //#endregion
 //#region src/transforms/index.ts
 function createErrorProxy(err, id) {
@@ -1727,8 +1857,10 @@ async function transform(code, cache, id, context, opt, output) {
 		});
 	} catch (err) {
 		context.error(createErrorProxy(err, id));
+		return "";
 	}
 }
+
 //#endregion
 //#region src/compile-mcx/compiler/main.ts
 function createMcxPlugin(opt, output) {
@@ -1859,14 +1991,11 @@ function createMcxPlugin(opt, output) {
 					compileData = cache.has(id) ? cache.get(id) : compileMCXFn(code);
 					cache.set(id, compileData);
 				} catch (err) {
-					if (err instanceof CompileError) {
-						const error = err;
-						this.error(error.message, {
-							column: error.loc.column,
-							line: error.loc.line
-						});
-					}
-					this.error(err instanceof Error ? `${err.message} : ${err.stack}` : String(err));
+					if (err instanceof CompileError) this.error(err.message, {
+						column: err.loc.column,
+						line: err.loc.line
+					});
+					else this.error(err instanceof Error ? `${err.message} : ${err.stack}` : String(err));
 					return;
 				}
 				compileData.setFilePath(id);
@@ -1905,16 +2034,18 @@ function rollupPlugin(opt, output) {
 function rolldownPlugin(opt, output) {
 	return createMcxPlugin(opt, output);
 }
+
 //#endregion
 //#region src/types.ts
 var types_exports$1 = /* @__PURE__ */ __exportAll({});
+
 //#endregion
 //#region src/mcx-component/types.ts
 var types_exports = /* @__PURE__ */ __exportAll({ createFileEdit: () => createFileEdit });
 function createFileEdit(expression) {
 	return expression;
 }
-//#endregion
-export { ast_default as AST, BlockComponent, types_exports as ComponentType, EntityComponent, GIFImageComponent, ItemComponent, JPGImageComponent, PNGImageComponent, types_exports$1 as PubType, SVGImageComponent, mcx_component_exports as compile_component, compiler_exports as compiler, rolldownPlugin, rollupPlugin, transform, Utils as utils };
 
+//#endregion
+export { ast_default as AST, types_exports as ComponentType, types_exports$1 as PubType, mcx_component_exports as compile_component, compiler_exports as compiler, rolldownPlugin, rollupPlugin, transform, Utils as utils };
 //# sourceMappingURL=index.js.map