xmlui 0.12.1 → 0.12.3

package/dist/bin/index.cjs

@@ -6816,6 +6816,28 @@ async function doParseModule(moduleName, source, moduleFetcher) {
 */
 const PARSED_MARK_PROP = "__PARSED__";
 /**
+* Marker property for arrow expression objects.
+* Used to identify executable arrow expressions in the expression tree.
+* These represent user-defined functions that can be called.
+*
+* @example
+* ```typescript
+* // Arrow functions created during script execution
+* const arrowFn = {
+*   _ARROW_EXPR_: true,
+*   args: ['x', 'y'],
+*   statement: { ... },
+*   closureContext: [...]
+* };
+*
+* // Check if a value is an arrow function
+* if (isArrowExpressionObject(value)) {
+*   // Can be called as a function
+* }
+* ```
+*/
+const ARROW_EXPR_MARK = "_ARROW_EXPR_";
+/**
 * Marker property for parsed event values.
 * Used to identify pre-parsed event handler syntax trees.
 *
@@ -7087,14 +7109,12 @@ async function collectCodeBehindFromSourceWithImports(moduleName, source, module
 			const arrow = {
 				type: T_ARROW_EXPRESSION,
 				args: funcDecl.args.slice(),
-				statement: funcDecl.stmt
-			};
-			const codeDecl = {
-				[PARSED_MARK_PROP]: true,
-				tree: arrow
+				statement: funcDecl.stmt,
+				[ARROW_EXPR_MARK]: true,
+				closureContext: []
 			};
-			collectedFunctions[name] = codeDecl;
-			result.functions[name] = codeDecl;
+			collectedFunctions[name] = arrow;
+			result.functions[name] = arrow;
 		}
 	});
 	return result;
@@ -7109,8 +7129,7 @@ function collectStatementFromModule(stmt, result, collectedFunctions) {
 				if (decl.id.name in result.vars) throw new Error(`Duplicated var declaration: '${decl.id.name}'`);
 				result.vars[decl.id.name] = {
 					[PARSED_MARK_PROP]: true,
-					tree: decl.expr,
-					source: decl.expr?.source || null
+					tree: decl.expr
 				};
 			});
 			break;
@@ -7129,16 +7148,12 @@ function addFunctionDeclaration(stmt, result, collectedFunctions) {
 	const arrow = {
 		type: T_ARROW_EXPRESSION,
 		args: stmt.args.slice(),
-		statement: stmt.stmt
-	};
-	collectedFunctions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
-	};
-	result.functions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
+		statement: stmt.stmt,
+		[ARROW_EXPR_MARK]: true,
+		closureContext: []
 	};
+	collectedFunctions[stmt.id.name] = arrow;
+	result.functions[stmt.id.name] = arrow;
 }
 function removeCodeBehindTokensFromTree(declarations) {
 	if (!declarations) return;
@@ -7163,7 +7178,8 @@ function removeCodeBehindTokensFromTree(declarations) {
 			}
 			return state$1;
 		};
-		visitNode(declaration.tree, state, nodeVisitor, nodeVisitor);
+		const tree = declaration.tree || declaration;
+		if (tree) visitNode(tree, state, nodeVisitor, nodeVisitor);
 	}
 }
 
@@ -7711,6 +7727,7 @@ const ErrCodesTransform = {
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
 	globalNotAllowedInNested: "T031",
+	globalNotAllowedInComponent: "T032",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -7798,7 +7815,11 @@ const DIAGS_TRANSFORM = {
 	},
 	globalNotAllowedInNested: {
 		code: ErrCodesTransform.globalNotAllowedInNested,
-		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+		message: "Global variables can only be declared in the root element of Main.xmlui, not in nested components."
+	},
+	globalNotAllowedInComponent: {
+		code: ErrCodesTransform.globalNotAllowedInComponent,
+		message: "Global variables cannot be declared in component definitions. Use Globals.xs or declare them in Main.xmlui instead."
 	},
 	cantHaveNameAttr: function(nodeName) {
 		return {
@@ -8258,38 +8279,26 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				vars[attr.name] = attr.value;
 			});
 		}
-		let globals;
-		const globalsAttrs = attrs.filter((attr) => attr.startSegment === "global");
-		if (globalsAttrs.length > 0) {
-			globals = {};
-			globalsAttrs.forEach((attr) => {
-				globals[attr.name] = attr.value;
-			});
-		}
+		if (attrs.filter((attr) => attr.startSegment === "global").length > 0) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent);
 		const children = getChildNodes(node$1);
 		const nestedComponents = children.filter((child) => child.kind === SyntaxKind.ElementNode && !(getComponentName(child, getText) in HelperNode));
 		if (nestedComponents.length === 0) nestedComponents.push(createTextNodeElement(""));
 		const nonVarHelperNodes = [];
 		const nestedVars = [];
-		const nestedGlobals = [];
 		for (let child of children) if (child.kind === SyntaxKind.ElementNode) {
 			const childName = getComponentName(child, getText);
 			if (childName === HelperNode.variable) nestedVars.push(child);
-			else if (childName === HelperNode.global) nestedGlobals.push(child);
+			else if (childName === HelperNode.global) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent, child.start, child.end);
 			else if (childName in HelperNode) nonVarHelperNodes.push(child);
 		}
 		let element;
-		if (nestedComponents.length > 1 || nestedVars.length > 0 || nestedGlobals.length > 0) element = wrapWithFragment([
-			...nestedVars,
-			...nestedGlobals,
-			...nestedComponents
-		]);
+		if (nestedComponents.length > 1 || nestedVars.length > 0) element = wrapWithFragment([...nestedVars, ...nestedComponents]);
 		else element = nestedComponents[0];
 		namespaceStack.push(/* @__PURE__ */ new Map());
 		attrs.filter((attr) => attr.namespace === "xmlns").forEach((attr) => {
 			addToNamespaces(namespaceStack, element, attr.unsegmentedName, attr.value);
 		});
-		let nestedComponent = transformInnerElement(usesStack, element, true);
+		let nestedComponent = transformInnerElement(usesStack, element, false);
 		namespaceStack.pop();
 		const component = {
 			name: compoundName.value,
@@ -8305,10 +8314,6 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 			...nestedComponent.vars,
 			...vars
 		};
-		if (globals) nestedComponent.globalVars = {
-			...nestedComponent.globalVars,
-			...globals
-		};
 		if (codeBehind) component.codeBehind = codeBehind.value;
 		nestedComponent.debug = { source: {
 			start: element.start,
@@ -10001,14 +10006,17 @@ const moduleScriptExtension = /* @__PURE__ */ new RegExp(`.${moduleFileExtension
 * Transform XMLUI files to JS objects.
 */
 function viteXmluiPlugin(pluginOptions = {}) {
-	let itemIndex = 0;
+	let projectRoot = "";
 	const normalizePath = (p) => p.replace(/\\/g, "/");
 	return {
 		name: "vite:transform-xmlui",
+		configResolved(config) {
+			projectRoot = normalizePath(config.root);
+		},
 		async transform(code, id, options) {
 			const normalizedId = normalizePath(id);
 			if (xmluiExtension.test(id)) {
-				const fileId = "" + itemIndex++;
+				const fileId = projectRoot ? normalizedId.slice(projectRoot.length) : normalizedId;
 				const scriptResult = ScriptExtractor.extractInlineScript(code);
 				let codeBehind;
 				if (scriptResult) {
@@ -10414,6 +10422,7 @@ const buildLib = async ({ watchMode, mode = "production" }) => {
 		overrides = (await import(process.cwd() + `/vite.config-overrides`)).default || {};
 	} catch (e) {}
 	await (0, vite.build)((0, vite.defineConfig)({
+		customLogger: overrides.customLogger,
 		resolve: { extensions: [
 			".js",
 			".ts",

package/dist/bin/index.js

@@ -6803,6 +6803,28 @@ async function doParseModule(moduleName, source, moduleFetcher) {
 */
 const PARSED_MARK_PROP = "__PARSED__";
 /**
+* Marker property for arrow expression objects.
+* Used to identify executable arrow expressions in the expression tree.
+* These represent user-defined functions that can be called.
+*
+* @example
+* ```typescript
+* // Arrow functions created during script execution
+* const arrowFn = {
+*   _ARROW_EXPR_: true,
+*   args: ['x', 'y'],
+*   statement: { ... },
+*   closureContext: [...]
+* };
+*
+* // Check if a value is an arrow function
+* if (isArrowExpressionObject(value)) {
+*   // Can be called as a function
+* }
+* ```
+*/
+const ARROW_EXPR_MARK = "_ARROW_EXPR_";
+/**
 * Marker property for parsed event values.
 * Used to identify pre-parsed event handler syntax trees.
 *
@@ -7074,14 +7096,12 @@ async function collectCodeBehindFromSourceWithImports(moduleName, source, module
 			const arrow = {
 				type: T_ARROW_EXPRESSION,
 				args: funcDecl.args.slice(),
-				statement: funcDecl.stmt
-			};
-			const codeDecl = {
-				[PARSED_MARK_PROP]: true,
-				tree: arrow
+				statement: funcDecl.stmt,
+				[ARROW_EXPR_MARK]: true,
+				closureContext: []
 			};
-			collectedFunctions[name] = codeDecl;
-			result.functions[name] = codeDecl;
+			collectedFunctions[name] = arrow;
+			result.functions[name] = arrow;
 		}
 	});
 	return result;
@@ -7096,8 +7116,7 @@ function collectStatementFromModule(stmt, result, collectedFunctions) {
 				if (decl.id.name in result.vars) throw new Error(`Duplicated var declaration: '${decl.id.name}'`);
 				result.vars[decl.id.name] = {
 					[PARSED_MARK_PROP]: true,
-					tree: decl.expr,
-					source: decl.expr?.source || null
+					tree: decl.expr
 				};
 			});
 			break;
@@ -7116,16 +7135,12 @@ function addFunctionDeclaration(stmt, result, collectedFunctions) {
 	const arrow = {
 		type: T_ARROW_EXPRESSION,
 		args: stmt.args.slice(),
-		statement: stmt.stmt
-	};
-	collectedFunctions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
-	};
-	result.functions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
+		statement: stmt.stmt,
+		[ARROW_EXPR_MARK]: true,
+		closureContext: []
 	};
+	collectedFunctions[stmt.id.name] = arrow;
+	result.functions[stmt.id.name] = arrow;
 }
 function removeCodeBehindTokensFromTree(declarations) {
 	if (!declarations) return;
@@ -7150,7 +7165,8 @@ function removeCodeBehindTokensFromTree(declarations) {
 			}
 			return state$1;
 		};
-		visitNode(declaration.tree, state, nodeVisitor, nodeVisitor);
+		const tree = declaration.tree || declaration;
+		if (tree) visitNode(tree, state, nodeVisitor, nodeVisitor);
 	}
 }
 
@@ -7698,6 +7714,7 @@ const ErrCodesTransform = {
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
 	globalNotAllowedInNested: "T031",
+	globalNotAllowedInComponent: "T032",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -7785,7 +7802,11 @@ const DIAGS_TRANSFORM = {
 	},
 	globalNotAllowedInNested: {
 		code: ErrCodesTransform.globalNotAllowedInNested,
-		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+		message: "Global variables can only be declared in the root element of Main.xmlui, not in nested components."
+	},
+	globalNotAllowedInComponent: {
+		code: ErrCodesTransform.globalNotAllowedInComponent,
+		message: "Global variables cannot be declared in component definitions. Use Globals.xs or declare them in Main.xmlui instead."
 	},
 	cantHaveNameAttr: function(nodeName) {
 		return {
@@ -8245,38 +8266,26 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				vars[attr.name] = attr.value;
 			});
 		}
-		let globals;
-		const globalsAttrs = attrs.filter((attr) => attr.startSegment === "global");
-		if (globalsAttrs.length > 0) {
-			globals = {};
-			globalsAttrs.forEach((attr) => {
-				globals[attr.name] = attr.value;
-			});
-		}
+		if (attrs.filter((attr) => attr.startSegment === "global").length > 0) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent);
 		const children = getChildNodes(node$1);
 		const nestedComponents = children.filter((child) => child.kind === SyntaxKind.ElementNode && !(getComponentName(child, getText) in HelperNode));
 		if (nestedComponents.length === 0) nestedComponents.push(createTextNodeElement(""));
 		const nonVarHelperNodes = [];
 		const nestedVars = [];
-		const nestedGlobals = [];
 		for (let child of children) if (child.kind === SyntaxKind.ElementNode) {
 			const childName = getComponentName(child, getText);
 			if (childName === HelperNode.variable) nestedVars.push(child);
-			else if (childName === HelperNode.global) nestedGlobals.push(child);
+			else if (childName === HelperNode.global) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent, child.start, child.end);
 			else if (childName in HelperNode) nonVarHelperNodes.push(child);
 		}
 		let element;
-		if (nestedComponents.length > 1 || nestedVars.length > 0 || nestedGlobals.length > 0) element = wrapWithFragment([
-			...nestedVars,
-			...nestedGlobals,
-			...nestedComponents
-		]);
+		if (nestedComponents.length > 1 || nestedVars.length > 0) element = wrapWithFragment([...nestedVars, ...nestedComponents]);
 		else element = nestedComponents[0];
 		namespaceStack.push(/* @__PURE__ */ new Map());
 		attrs.filter((attr) => attr.namespace === "xmlns").forEach((attr) => {
 			addToNamespaces(namespaceStack, element, attr.unsegmentedName, attr.value);
 		});
-		let nestedComponent = transformInnerElement(usesStack, element, true);
+		let nestedComponent = transformInnerElement(usesStack, element, false);
 		namespaceStack.pop();
 		const component = {
 			name: compoundName.value,
@@ -8292,10 +8301,6 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 			...nestedComponent.vars,
 			...vars
 		};
-		if (globals) nestedComponent.globalVars = {
-			...nestedComponent.globalVars,
-			...globals
-		};
 		if (codeBehind) component.codeBehind = codeBehind.value;
 		nestedComponent.debug = { source: {
 			start: element.start,
@@ -9988,14 +9993,17 @@ const moduleScriptExtension = /* @__PURE__ */ new RegExp(`.${moduleFileExtension
 * Transform XMLUI files to JS objects.
 */
 function viteXmluiPlugin(pluginOptions = {}) {
-	let itemIndex = 0;
+	let projectRoot = "";
 	const normalizePath = (p) => p.replace(/\\/g, "/");
 	return {
 		name: "vite:transform-xmlui",
+		configResolved(config) {
+			projectRoot = normalizePath(config.root);
+		},
 		async transform(code, id, options) {
 			const normalizedId = normalizePath(id);
 			if (xmluiExtension.test(id)) {
-				const fileId = "" + itemIndex++;
+				const fileId = projectRoot ? normalizedId.slice(projectRoot.length) : normalizedId;
 				const scriptResult = ScriptExtractor.extractInlineScript(code);
 				let codeBehind;
 				if (scriptResult) {
@@ -10401,6 +10409,7 @@ const buildLib = async ({ watchMode, mode = "production" }) => {
 		overrides = (await import(process.cwd() + `/vite.config-overrides`)).default || {};
 	} catch (e) {}
 	await build(defineConfig({
+		customLogger: overrides.customLogger,
 		resolve: { extensions: [
 			".js",
 			".ts",

package/dist/for-node/server.cjs

@@ -407,6 +407,7 @@ const ErrCodesTransform = {
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
 	globalNotAllowedInNested: "T031",
+	globalNotAllowedInComponent: "T032",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -494,7 +495,11 @@ const DIAGS_TRANSFORM = {
 	},
 	globalNotAllowedInNested: {
 		code: ErrCodesTransform.globalNotAllowedInNested,
-		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+		message: "Global variables can only be declared in the root element of Main.xmlui, not in nested components."
+	},
+	globalNotAllowedInComponent: {
+		code: ErrCodesTransform.globalNotAllowedInComponent,
+		message: "Global variables cannot be declared in component definitions. Use Globals.xs or declare them in Main.xmlui instead."
 	},
 	cantHaveNameAttr: function(nodeName) {
 		return {

package/dist/for-node/server.js

@@ -378,6 +378,7 @@ const ErrCodesTransform = {
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
 	globalNotAllowedInNested: "T031",
+	globalNotAllowedInComponent: "T032",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -465,7 +466,11 @@ const DIAGS_TRANSFORM = {
 	},
 	globalNotAllowedInNested: {
 		code: ErrCodesTransform.globalNotAllowedInNested,
-		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+		message: "Global variables can only be declared in the root element of Main.xmlui, not in nested components."
+	},
+	globalNotAllowedInComponent: {
+		code: ErrCodesTransform.globalNotAllowedInComponent,
+		message: "Global variables cannot be declared in component definitions. Use Globals.xs or declare them in Main.xmlui instead."
 	},
 	cantHaveNameAttr: function(nodeName) {
 		return {

package/dist/for-node/vite-xmlui-plugin.cjs

@@ -6784,6 +6784,28 @@ async function doParseModule(moduleName, source, moduleFetcher) {
 */
 const PARSED_MARK_PROP = "__PARSED__";
 /**
+* Marker property for arrow expression objects.
+* Used to identify executable arrow expressions in the expression tree.
+* These represent user-defined functions that can be called.
+*
+* @example
+* ```typescript
+* // Arrow functions created during script execution
+* const arrowFn = {
+*   _ARROW_EXPR_: true,
+*   args: ['x', 'y'],
+*   statement: { ... },
+*   closureContext: [...]
+* };
+*
+* // Check if a value is an arrow function
+* if (isArrowExpressionObject(value)) {
+*   // Can be called as a function
+* }
+* ```
+*/
+const ARROW_EXPR_MARK = "_ARROW_EXPR_";
+/**
 * Marker property for parsed event values.
 * Used to identify pre-parsed event handler syntax trees.
 *
@@ -7055,14 +7077,12 @@ async function collectCodeBehindFromSourceWithImports(moduleName, source, module
 			const arrow = {
 				type: T_ARROW_EXPRESSION,
 				args: funcDecl.args.slice(),
-				statement: funcDecl.stmt
-			};
-			const codeDecl = {
-				[PARSED_MARK_PROP]: true,
-				tree: arrow
+				statement: funcDecl.stmt,
+				[ARROW_EXPR_MARK]: true,
+				closureContext: []
 			};
-			collectedFunctions[name] = codeDecl;
-			result.functions[name] = codeDecl;
+			collectedFunctions[name] = arrow;
+			result.functions[name] = arrow;
 		}
 	});
 	return result;
@@ -7077,8 +7097,7 @@ function collectStatementFromModule(stmt, result, collectedFunctions) {
 				if (decl.id.name in result.vars) throw new Error(`Duplicated var declaration: '${decl.id.name}'`);
 				result.vars[decl.id.name] = {
 					[PARSED_MARK_PROP]: true,
-					tree: decl.expr,
-					source: decl.expr?.source || null
+					tree: decl.expr
 				};
 			});
 			break;
@@ -7097,16 +7116,12 @@ function addFunctionDeclaration(stmt, result, collectedFunctions) {
 	const arrow = {
 		type: T_ARROW_EXPRESSION,
 		args: stmt.args.slice(),
-		statement: stmt.stmt
-	};
-	collectedFunctions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
-	};
-	result.functions[stmt.id.name] = {
-		[PARSED_MARK_PROP]: true,
-		tree: arrow
+		statement: stmt.stmt,
+		[ARROW_EXPR_MARK]: true,
+		closureContext: []
 	};
+	collectedFunctions[stmt.id.name] = arrow;
+	result.functions[stmt.id.name] = arrow;
 }
 function removeCodeBehindTokensFromTree(declarations) {
 	if (!declarations) return;
@@ -7131,7 +7146,8 @@ function removeCodeBehindTokensFromTree(declarations) {
 			}
 			return state$1;
 		};
-		visitNode(declaration.tree, state, nodeVisitor, nodeVisitor);
+		const tree = declaration.tree || declaration;
+		if (tree) visitNode(tree, state, nodeVisitor, nodeVisitor);
 	}
 }
 
@@ -7679,6 +7695,7 @@ const ErrCodesTransform = {
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
 	globalNotAllowedInNested: "T031",
+	globalNotAllowedInComponent: "T032",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -7766,7 +7783,11 @@ const DIAGS_TRANSFORM = {
 	},
 	globalNotAllowedInNested: {
 		code: ErrCodesTransform.globalNotAllowedInNested,
-		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+		message: "Global variables can only be declared in the root element of Main.xmlui, not in nested components."
+	},
+	globalNotAllowedInComponent: {
+		code: ErrCodesTransform.globalNotAllowedInComponent,
+		message: "Global variables cannot be declared in component definitions. Use Globals.xs or declare them in Main.xmlui instead."
 	},
 	cantHaveNameAttr: function(nodeName) {
 		return {
@@ -8226,38 +8247,26 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				vars[attr.name] = attr.value;
 			});
 		}
-		let globals;
-		const globalsAttrs = attrs.filter((attr) => attr.startSegment === "global");
-		if (globalsAttrs.length > 0) {
-			globals = {};
-			globalsAttrs.forEach((attr) => {
-				globals[attr.name] = attr.value;
-			});
-		}
+		if (attrs.filter((attr) => attr.startSegment === "global").length > 0) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent);
 		const children = getChildNodes(node$1);
 		const nestedComponents = children.filter((child) => child.kind === SyntaxKind.ElementNode && !(getComponentName(child, getText) in HelperNode));
 		if (nestedComponents.length === 0) nestedComponents.push(createTextNodeElement(""));
 		const nonVarHelperNodes = [];
 		const nestedVars = [];
-		const nestedGlobals = [];
 		for (let child of children) if (child.kind === SyntaxKind.ElementNode) {
 			const childName = getComponentName(child, getText);
 			if (childName === HelperNode.variable) nestedVars.push(child);
-			else if (childName === HelperNode.global) nestedGlobals.push(child);
+			else if (childName === HelperNode.global) reportError(DIAGS_TRANSFORM.globalNotAllowedInComponent, child.start, child.end);
 			else if (childName in HelperNode) nonVarHelperNodes.push(child);
 		}
 		let element;
-		if (nestedComponents.length > 1 || nestedVars.length > 0 || nestedGlobals.length > 0) element = wrapWithFragment([
-			...nestedVars,
-			...nestedGlobals,
-			...nestedComponents
-		]);
+		if (nestedComponents.length > 1 || nestedVars.length > 0) element = wrapWithFragment([...nestedVars, ...nestedComponents]);
 		else element = nestedComponents[0];
 		namespaceStack.push(/* @__PURE__ */ new Map());
 		attrs.filter((attr) => attr.namespace === "xmlns").forEach((attr) => {
 			addToNamespaces(namespaceStack, element, attr.unsegmentedName, attr.value);
 		});
-		let nestedComponent = transformInnerElement(usesStack, element, true);
+		let nestedComponent = transformInnerElement(usesStack, element, false);
 		namespaceStack.pop();
 		const component = {
 			name: compoundName.value,
@@ -8273,10 +8282,6 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 			...nestedComponent.vars,
 			...vars
 		};
-		if (globals) nestedComponent.globalVars = {
-			...nestedComponent.globalVars,
-			...globals
-		};
 		if (codeBehind) component.codeBehind = codeBehind.value;
 		nestedComponent.debug = { source: {
 			start: element.start,
@@ -9969,14 +9974,17 @@ const moduleScriptExtension = /* @__PURE__ */ new RegExp(`.${moduleFileExtension
 * Transform XMLUI files to JS objects.
 */
 function viteXmluiPlugin(pluginOptions = {}) {
-	let itemIndex = 0;
+	let projectRoot = "";
 	const normalizePath = (p) => p.replace(/\\/g, "/");
 	return {
 		name: "vite:transform-xmlui",
+		configResolved(config) {
+			projectRoot = normalizePath(config.root);
+		},
 		async transform(code, id, options) {
 			const normalizedId = normalizePath(id);
 			if (xmluiExtension.test(id)) {
-				const fileId = "" + itemIndex++;
+				const fileId = projectRoot ? normalizedId.slice(projectRoot.length) : normalizedId;
 				const scriptResult = ScriptExtractor.extractInlineScript(code);
 				let codeBehind;
 				if (scriptResult) {