xmlui 0.12.0 → 0.12.1

package/dist/bin/index.cjs

@@ -5596,16 +5596,22 @@ var Parser = class {
 	* @param stump Stump properties
 	* @param startToken The token that starts the expression
 	* @param endToken The token that ends the expression
-	* @param source Expression source code to store to the node
 	*/
 	createExpressionNode(type, stump = {}, startToken, endToken) {
 		if (!endToken) endToken = this._lexer.peek();
 		if (!startToken) startToken = endToken;
+		let source;
+		if (startToken && endToken && this._lexer.input.source) {
+			const startPos = startToken.startPosition;
+			const endPos = endToken.endPosition;
+			if (startPos <= endPos) source = this._lexer.input.source.substring(startPos, endPos);
+		}
 		return Object.assign({}, stump, {
 			type,
 			nodeId: createXmlUiTreeNodeId(),
 			startToken,
-			endToken
+			endToken,
+			source
 		});
 	}
 	/**
@@ -7103,7 +7109,8 @@ 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
+					tree: decl.expr,
+					source: decl.expr?.source || null
 				};
 			});
 			break;
@@ -7703,6 +7710,7 @@ const ErrCodesTransform = {
 	nsValueIncorrect: "T028",
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
+	globalNotAllowedInNested: "T031",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -7788,6 +7796,10 @@ const DIAGS_TRANSFORM = {
 		code: ErrCodesTransform.cannotMixFieldItem,
 		message: "Cannot mix 'field' and 'item' nodes within an element."
 	},
+	globalNotAllowedInNested: {
+		code: ErrCodesTransform.globalNotAllowedInNested,
+		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+	},
 	cantHaveNameAttr: function(nodeName) {
 		return {
 			code: ErrCodesTransform.cantHaveNameAttr,
@@ -8178,6 +8190,7 @@ const HelperNode = {
 	template: "template",
 	event: "event",
 	variable: "variable",
+	global: "global",
 	loaders: "loaders",
 	uses: "uses",
 	method: "method",
@@ -8204,11 +8217,11 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				fileId
 			} }
 		};
-		collectTraits(usesStack$1, component, node$1);
+		collectTraits(usesStack$1, component, node$1, true);
 		hoistScriptCollectedFromFragments(component);
 		return component;
 	}
-	function transformInnerElement(usesStack$1, node$1) {
+	function transformInnerElement(usesStack$1, node$1, allowGlobalVars = false) {
 		const name = getNamespaceResolvedComponentName(node$1, getText, namespaceStack);
 		if (name === COMPOUND_COMP_ID) reportError(DIAGS_TRANSFORM.nestedCompDefs);
 		let component = {
@@ -8219,7 +8232,7 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				fileId
 			} }
 		};
-		collectTraits(usesStack$1, component, node$1);
+		collectTraits(usesStack$1, component, node$1, allowGlobalVars);
 		hoistScriptCollectedFromFragments(component);
 		return component;
 	}
@@ -8245,24 +8258,38 @@ 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;
+			});
+		}
 		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 in HelperNode) nonVarHelperNodes.push(child);
 		}
 		let element;
-		if (nestedComponents.length > 1 || nestedVars.length > 0) element = wrapWithFragment([...nestedVars, ...nestedComponents]);
+		if (nestedComponents.length > 1 || nestedVars.length > 0 || nestedGlobals.length > 0) element = wrapWithFragment([
+			...nestedVars,
+			...nestedGlobals,
+			...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);
+		let nestedComponent = transformInnerElement(usesStack, element, true);
 		namespaceStack.pop();
 		const component = {
 			name: compoundName.value,
@@ -8278,26 +8305,31 @@ 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,
 			end: element.end,
 			fileId
 		} };
-		collectTraits(usesStack, component, withNewChildNodes(node$1, nonVarHelperNodes));
+		collectTraits(usesStack, component, withNewChildNodes(node$1, nonVarHelperNodes), false);
 		return component;
 	}
 	/**
 	* Collects component traits from attributes and child elements
 	* @param comp Component definition
 	* @param element Component element
+	* @param allowGlobalVars Whether global variables are allowed in this context
 	*/
-	function collectTraits(usesStack$1, comp, element) {
+	function collectTraits(usesStack$1, comp, element, allowGlobalVars = false) {
 		const isCompound = !isComponent(comp);
 		const attributes = getAttributes(element);
 		namespaceStack.push(/* @__PURE__ */ new Map());
 		attributes.forEach((attr) => {
-			collectAttribute(comp, attr);
+			collectAttribute(comp, attr, allowGlobalVars);
 		});
 		const childNodes = getChildNodes(element);
 		let hasScriptNode = false;
@@ -8348,6 +8380,17 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 						comp.vars[name] = value;
 					});
 					return;
+				case HelperNode.global:
+					if (!allowGlobalVars) {
+						reportError(DIAGS_TRANSFORM.globalNotAllowedInNested);
+						return;
+					}
+					collectElementHelper(usesStack$1, comp, child, (name) => isComponent(comp) ? comp.globalVars?.[name] : void 0, (name, value) => {
+						if (!isComponent(comp)) return;
+						comp.globalVars ??= {};
+						comp.globalVars[name] = value;
+					});
+					return;
 				case "loaders":
 					collectLoadersElements(usesStack$1, comp, child);
 					return;
@@ -8367,12 +8410,12 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 		});
 		namespaceStack.pop();
 	}
-	function collectAttribute(comp, attr) {
+	function collectAttribute(comp, attr, allowGlobalVars = false) {
 		const { namespace, startSegment, name, value, unsegmentedName: nsKey } = segmentAttr(attr);
 		const attrValueStringNode = attr.children[2];
 		if (namespace === "xmlns") return addToNamespaces(namespaceStack, comp, nsKey, value);
 		if (!isComponent(comp)) {
-			if (startSegment && startSegment !== "method" && startSegment !== "var") {
+			if (startSegment && startSegment !== "method" && startSegment !== "var" && startSegment !== "global") {
 				reportError(DIAGS_TRANSFORM.invalidReusableCompAttr(nsKey));
 				return;
 			}
@@ -8398,6 +8441,13 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				if (startSegment === "var") {
 					comp.vars ??= {};
 					comp.vars[name] = value;
+				} else if (startSegment === "global") {
+					if (!allowGlobalVars) {
+						reportError(DIAGS_TRANSFORM.globalNotAllowedInNested);
+						return;
+					}
+					comp.globalVars ??= {};
+					comp.globalVars[name] = value;
 				} else if (startSegment === "method") {
 					comp.api ??= {};
 					comp.api[name] = value;
@@ -10033,6 +10083,26 @@ function viteXmluiPlugin(pluginOptions = {}) {
 				};
 			}
 			return null;
+		},
+		handleHotUpdate({ file, server }) {
+			const normalizedFile = normalizePath(file);
+			const isXmluiFile = xmluiExtension.test(normalizedFile);
+			const isXsFile = xmluiScriptExtension.test(normalizedFile) || moduleScriptExtension.test(normalizedFile);
+			if (isXmluiFile || isXsFile) {
+				clearAllModuleCaches();
+				if (isXsFile) {
+					this.warn(`[vite-xmlui-plugin] Processing updated script file: ${file}`);
+					const allModules = Array.from(server.moduleGraph.idToModuleMap.values());
+					for (const mod of allModules) server.moduleGraph.invalidateModule(mod);
+					server.ws.send({
+						type: "full-reload",
+						path: "*"
+					});
+					return [];
+				}
+				const module$1 = server.moduleGraph.getModuleById(normalizedFile);
+				if (module$1) return [module$1];
+			}
 		}
 	};
 }

package/dist/bin/index.js

@@ -5583,16 +5583,22 @@ var Parser = class {
 	* @param stump Stump properties
 	* @param startToken The token that starts the expression
 	* @param endToken The token that ends the expression
-	* @param source Expression source code to store to the node
 	*/
 	createExpressionNode(type, stump = {}, startToken, endToken) {
 		if (!endToken) endToken = this._lexer.peek();
 		if (!startToken) startToken = endToken;
+		let source;
+		if (startToken && endToken && this._lexer.input.source) {
+			const startPos = startToken.startPosition;
+			const endPos = endToken.endPosition;
+			if (startPos <= endPos) source = this._lexer.input.source.substring(startPos, endPos);
+		}
 		return Object.assign({}, stump, {
 			type,
 			nodeId: createXmlUiTreeNodeId(),
 			startToken,
-			endToken
+			endToken,
+			source
 		});
 	}
 	/**
@@ -7090,7 +7096,8 @@ 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
+					tree: decl.expr,
+					source: decl.expr?.source || null
 				};
 			});
 			break;
@@ -7690,6 +7697,7 @@ const ErrCodesTransform = {
 	nsValueIncorrect: "T028",
 	nsSchemeIncorrect: "T029",
 	scriptParse: "T030",
+	globalNotAllowedInNested: "T031",
 	...ErrorCodes
 };
 const DIAGS_TRANSFORM = {
@@ -7775,6 +7783,10 @@ const DIAGS_TRANSFORM = {
 		code: ErrCodesTransform.cannotMixFieldItem,
 		message: "Cannot mix 'field' and 'item' nodes within an element."
 	},
+	globalNotAllowedInNested: {
+		code: ErrCodesTransform.globalNotAllowedInNested,
+		message: "Global variables can only be declared in the root element or compound component definitions, not in nested regular components."
+	},
 	cantHaveNameAttr: function(nodeName) {
 		return {
 			code: ErrCodesTransform.cantHaveNameAttr,
@@ -8165,6 +8177,7 @@ const HelperNode = {
 	template: "template",
 	event: "event",
 	variable: "variable",
+	global: "global",
 	loaders: "loaders",
 	uses: "uses",
 	method: "method",
@@ -8191,11 +8204,11 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				fileId
 			} }
 		};
-		collectTraits(usesStack$1, component, node$1);
+		collectTraits(usesStack$1, component, node$1, true);
 		hoistScriptCollectedFromFragments(component);
 		return component;
 	}
-	function transformInnerElement(usesStack$1, node$1) {
+	function transformInnerElement(usesStack$1, node$1, allowGlobalVars = false) {
 		const name = getNamespaceResolvedComponentName(node$1, getText, namespaceStack);
 		if (name === COMPOUND_COMP_ID) reportError(DIAGS_TRANSFORM.nestedCompDefs);
 		let component = {
@@ -8206,7 +8219,7 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				fileId
 			} }
 		};
-		collectTraits(usesStack$1, component, node$1);
+		collectTraits(usesStack$1, component, node$1, allowGlobalVars);
 		hoistScriptCollectedFromFragments(component);
 		return component;
 	}
@@ -8232,24 +8245,38 @@ 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;
+			});
+		}
 		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 in HelperNode) nonVarHelperNodes.push(child);
 		}
 		let element;
-		if (nestedComponents.length > 1 || nestedVars.length > 0) element = wrapWithFragment([...nestedVars, ...nestedComponents]);
+		if (nestedComponents.length > 1 || nestedVars.length > 0 || nestedGlobals.length > 0) element = wrapWithFragment([
+			...nestedVars,
+			...nestedGlobals,
+			...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);
+		let nestedComponent = transformInnerElement(usesStack, element, true);
 		namespaceStack.pop();
 		const component = {
 			name: compoundName.value,
@@ -8265,26 +8292,31 @@ 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,
 			end: element.end,
 			fileId
 		} };
-		collectTraits(usesStack, component, withNewChildNodes(node$1, nonVarHelperNodes));
+		collectTraits(usesStack, component, withNewChildNodes(node$1, nonVarHelperNodes), false);
 		return component;
 	}
 	/**
 	* Collects component traits from attributes and child elements
 	* @param comp Component definition
 	* @param element Component element
+	* @param allowGlobalVars Whether global variables are allowed in this context
 	*/
-	function collectTraits(usesStack$1, comp, element) {
+	function collectTraits(usesStack$1, comp, element, allowGlobalVars = false) {
 		const isCompound = !isComponent(comp);
 		const attributes = getAttributes(element);
 		namespaceStack.push(/* @__PURE__ */ new Map());
 		attributes.forEach((attr) => {
-			collectAttribute(comp, attr);
+			collectAttribute(comp, attr, allowGlobalVars);
 		});
 		const childNodes = getChildNodes(element);
 		let hasScriptNode = false;
@@ -8335,6 +8367,17 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 						comp.vars[name] = value;
 					});
 					return;
+				case HelperNode.global:
+					if (!allowGlobalVars) {
+						reportError(DIAGS_TRANSFORM.globalNotAllowedInNested);
+						return;
+					}
+					collectElementHelper(usesStack$1, comp, child, (name) => isComponent(comp) ? comp.globalVars?.[name] : void 0, (name, value) => {
+						if (!isComponent(comp)) return;
+						comp.globalVars ??= {};
+						comp.globalVars[name] = value;
+					});
+					return;
 				case "loaders":
 					collectLoadersElements(usesStack$1, comp, child);
 					return;
@@ -8354,12 +8397,12 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 		});
 		namespaceStack.pop();
 	}
-	function collectAttribute(comp, attr) {
+	function collectAttribute(comp, attr, allowGlobalVars = false) {
 		const { namespace, startSegment, name, value, unsegmentedName: nsKey } = segmentAttr(attr);
 		const attrValueStringNode = attr.children[2];
 		if (namespace === "xmlns") return addToNamespaces(namespaceStack, comp, nsKey, value);
 		if (!isComponent(comp)) {
-			if (startSegment && startSegment !== "method" && startSegment !== "var") {
+			if (startSegment && startSegment !== "method" && startSegment !== "var" && startSegment !== "global") {
 				reportError(DIAGS_TRANSFORM.invalidReusableCompAttr(nsKey));
 				return;
 			}
@@ -8385,6 +8428,13 @@ function nodeToComponentDef(node, originalGetText, fileId, preResolvedImports) {
 				if (startSegment === "var") {
 					comp.vars ??= {};
 					comp.vars[name] = value;
+				} else if (startSegment === "global") {
+					if (!allowGlobalVars) {
+						reportError(DIAGS_TRANSFORM.globalNotAllowedInNested);
+						return;
+					}
+					comp.globalVars ??= {};
+					comp.globalVars[name] = value;
 				} else if (startSegment === "method") {
 					comp.api ??= {};
 					comp.api[name] = value;
@@ -10020,6 +10070,26 @@ function viteXmluiPlugin(pluginOptions = {}) {
 				};
 			}
 			return null;
+		},
+		handleHotUpdate({ file, server }) {
+			const normalizedFile = normalizePath(file);
+			const isXmluiFile = xmluiExtension.test(normalizedFile);
+			const isXsFile = xmluiScriptExtension.test(normalizedFile) || moduleScriptExtension.test(normalizedFile);
+			if (isXmluiFile || isXsFile) {
+				clearAllModuleCaches();
+				if (isXsFile) {
+					this.warn(`[vite-xmlui-plugin] Processing updated script file: ${file}`);
+					const allModules = Array.from(server.moduleGraph.idToModuleMap.values());
+					for (const mod of allModules) server.moduleGraph.invalidateModule(mod);
+					server.ws.send({
+						type: "full-reload",
+						path: "*"
+					});
+					return [];
+				}
+				const module$1 = server.moduleGraph.getModuleById(normalizedFile);
+				if (module$1) return [module$1];
+			}
 		}
 	};
 }