@vue-jsx-vapor/macros 2.3.4 → 2.3.6

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-CdPKEM79.cjs');
+const require_core = require('./core-C740HxiF.cjs');
 
 exports.getMacroExpression = require_core.getMacroExpression
 exports.getParamsStart = require_core.getParamsStart

package/dist/api.d.cts

@@ -1,6 +1,6 @@
 import { OptionsResolved } from "./options.d-CXMsJZSo.cjs";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
-import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, Node } from "@babel/types";
+import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node } from "@babel/types";
 
 //#region src/core/restructure.d.ts
 type Options = {
@@ -22,16 +22,19 @@ declare function restructure(s: MagicStringAST, node: FunctionalNode, options?:
 type FunctionalNode = FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
 type DefineStyle = {
     expression: CallExpression;
-    isDeclaration: boolean;
+    isCssModules: boolean;
     lang: string;
 };
-type RootMapValue = {
+type Macros = {
     defineComponent?: CallExpression;
     defineModel?: {
         expression: CallExpression;
         isRequired: boolean;
     }[];
-    defineSlots?: CallExpression;
+    defineSlots?: {
+        expression: CallExpression;
+        id?: LVal;
+    };
     defineExpose?: CallExpression;
     defineStyle?: DefineStyle[];
 };
@@ -41,4 +44,4 @@ declare function getMacroExpression(node: Node, options: OptionsResolved): CallE
 declare function getParamsStart(node: FunctionalNode, code: string): number;
 
 //#endregion
-export { DefineStyle, FunctionalNode, RootMapValue, getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros };
+export { DefineStyle, FunctionalNode, Macros, getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros };

package/dist/api.d.ts

@@ -1,6 +1,6 @@
 import { OptionsResolved } from "./options.d-DNWXuL_g.js";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
-import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, Node } from "@babel/types";
+import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node } from "@babel/types";
 
 //#region src/core/restructure.d.ts
 type Options = {
@@ -22,16 +22,19 @@ declare function restructure(s: MagicStringAST, node: FunctionalNode, options?:
 type FunctionalNode = FunctionDeclaration | FunctionExpression | ArrowFunctionExpression;
 type DefineStyle = {
     expression: CallExpression;
-    isDeclaration: boolean;
+    isCssModules: boolean;
     lang: string;
 };
-type RootMapValue = {
+type Macros = {
     defineComponent?: CallExpression;
     defineModel?: {
         expression: CallExpression;
         isRequired: boolean;
     }[];
-    defineSlots?: CallExpression;
+    defineSlots?: {
+        expression: CallExpression;
+        id?: LVal;
+    };
     defineExpose?: CallExpression;
     defineStyle?: DefineStyle[];
 };
@@ -41,4 +44,4 @@ declare function getMacroExpression(node: Node, options: OptionsResolved): CallE
 declare function getParamsStart(node: FunctionalNode, code: string): number;
 
 //#endregion
-export { DefineStyle, FunctionalNode, RootMapValue, getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros };
+export { DefineStyle, FunctionalNode, Macros, getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros };

package/dist/api.js

@@ -1,3 +1,3 @@
-import { getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros } from "./core-B_EM_kTA.js";
+import { getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros } from "./core-CHBxRAvb.js";
 
 export { getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-CdPKEM79.cjs → core-C740HxiF.cjs}

@@ -163,9 +163,9 @@ function transformReturn(root, s) {
 
 //#endregion
 //#region src/core/define-component/index.ts
-function transformDefineComponent(root, propsName, map, s, autoReturnFunction = false) {
-	if (!map.defineComponent) return;
-	const defineComponentName = s.sliceNode(map.defineComponent.callee);
+function transformDefineComponent(root, propsName, macros, s, autoReturnFunction = false) {
+	if (!macros.defineComponent) return;
+	const defineComponentName = s.sliceNode(macros.defineComponent.callee);
 	if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) (0, __vue_macros_common.importHelperFn)(s, 0, "defineComponent", defineComponentName);
 	let hasRestProp = false;
 	const props = {};
@@ -205,10 +205,10 @@ function transformDefineComponent(root, propsName, map, s, autoReturnFunction =
 			});
 		}
 	}
-	transformDefineModel$1(s, map.defineModel, props);
+	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
-		const argument = map.defineComponent.arguments[1];
+		const argument = macros.defineComponent.arguments[1];
 		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
 		else if (argument.type === "ObjectExpression") {
 			prependObjectExpression(argument, "props", `{\n${propsString}\n}`, s);
@@ -317,8 +317,8 @@ function transformDefineSlots(node, s) {
 
 //#endregion
 //#region src/core/define-style.ts
-function transformDefineStyle(defineStyle, index, root, s, importMap) {
-	const { expression, lang, isDeclaration } = defineStyle;
+function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSlots }) {
+	const { expression, lang, isCssModules } = defineStyle;
 	if (expression.arguments[0]?.type !== "TemplateLiteral") return;
 	let css = s.sliceNode(expression.arguments[0]).slice(1, -1);
 	const scopeId = (0, hash_sum.default)(css);
@@ -340,15 +340,25 @@ function transformDefineStyle(defineStyle, index, root, s, importMap) {
 	if (expression.arguments[1]?.type === "ObjectExpression") {
 		for (const prop of expression.arguments[1].properties) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === "scoped" && prop.value.type === "BooleanLiteral") scoped = prop.value.value;
 	}
-	if (scoped && returnExpression) (0, __vue_macros_common.walkAST)(returnExpression, { enter(node) {
-		if (node.type === "JSXElement" && s.sliceNode(node.openingElement.name) !== "template") s.appendRight(node.openingElement.name.end, ` data-v-${scopeId}=""`);
-	} });
+	if (scoped && root) {
+		const slotNames = defineSlots?.id ? defineSlots.id.type === "Identifier" ? defineSlots.id.name : defineSlots.id.type === "ObjectPattern" ? defineSlots.id.properties.map((prop) => s.sliceNode(prop.type === "RestElement" ? prop.argument : prop.value)) : [] : [];
+		(0, __vue_macros_common.walkAST)(root, { enter(node) {
+			if (node.type === "JSXElement" && s.sliceNode(node.openingElement.name) !== "template") {
+				let subfix = "";
+				if (slotNames.length) {
+					const name = s.sliceNode(node.openingElement.name.type === "JSXMemberExpression" ? node.openingElement.name.object : node.openingElement.name);
+					subfix = slotNames.includes(name) ? "-s" : "";
+				}
+				s.appendRight(node.openingElement.name.end, ` data-v-${scopeId}${subfix}=""`);
+			}
+		} });
+	}
 	css = s.sliceNode(expression.arguments[0]).slice(1, -1).replaceAll(/\/\/(.*)(?=\n)/g, "/*$1*/");
-	const module$1 = isDeclaration ? "module." : "";
+	const module$1 = isCssModules ? "module." : "";
 	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${module$1}${lang}`;
 	importMap.set(importId, css);
-	s.appendLeft(0, isDeclaration ? `import style${index} from "${importId}";` : `import "${importId}";`);
-	s.overwriteNode(expression, isDeclaration ? `style${index}` : "");
+	s.appendLeft(0, isCssModules ? `import style${index} from "${importId}";` : `import "${importId}";`);
+	s.overwriteNode(expression, isCssModules ? `style${index}` : "");
 }
 function getReturnStatement(root) {
 	if (root.body.type === "BlockStatement") {
@@ -369,9 +379,9 @@ function transformJsxMacros(code, id, importMap, options) {
 	const ast = (0, __vue_macros_common.babelParse)(s.original, (0, __vue_macros_common.getLang)(id));
 	const rootMap = getRootMap(ast, s, options);
 	let defineStyleIndex = 0;
-	for (const [root, map] of rootMap) {
-		map.defineStyle?.forEach((defineStyle) => {
-			transformDefineStyle(defineStyle, defineStyleIndex++, root, s, importMap);
+	for (const [root, macros] of rootMap) {
+		macros.defineStyle?.forEach((defineStyle) => {
+			transformDefineStyle(defineStyle, defineStyleIndex++, root, s, importMap, macros);
 		});
 		if (root === void 0) continue;
 		let propsName = `${__vue_macros_common.HELPER_PREFIX}props`;
@@ -379,16 +389,16 @@ function transformJsxMacros(code, id, importMap, options) {
 			if (root.params[0].type === "Identifier") propsName = root.params[0].name;
 			else if (root.params[0].type === "ObjectPattern") {
 				const lastProp = root.params[0].properties.at(-1);
-				if (!map.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
+				if (!macros.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
 				else s.appendRight(root.params[0].extra?.trailingComma ? root.params[0].extra?.trailingComma + 1 : lastProp?.end || root.params[0].end - 1, `${!root.params[0].extra?.trailingComma && root.params[0].properties.length ? "," : ""} ...${__vue_macros_common.HELPER_PREFIX}props`);
 			}
 		} else s.appendRight(getParamsStart(root, s.original), propsName);
-		if (map.defineComponent) transformDefineComponent(root, propsName, map, s, options.defineComponent?.autoReturnFunction);
-		if (map.defineModel?.length) map.defineModel.forEach(({ expression }) => {
+		if (macros.defineComponent) transformDefineComponent(root, propsName, macros, s, options.defineComponent?.autoReturnFunction);
+		if (macros.defineModel?.length) macros.defineModel.forEach(({ expression }) => {
 			transformDefineModel(expression, propsName, s);
 		});
-		if (map.defineSlots) transformDefineSlots(map.defineSlots, s);
-		if (map.defineExpose) transformDefineExpose(map.defineExpose, s, options.version);
+		if (macros.defineSlots) transformDefineSlots(macros.defineSlots.expression, s);
+		if (macros.defineExpose) transformDefineExpose(macros.defineExpose, s, options.version);
 	}
 	return (0, __vue_macros_common.generateTransform)(s, id);
 }
@@ -418,10 +428,13 @@ function getRootMap(ast, s, options) {
 					const lang = macroExpression.callee.type === "MemberExpression" && macroExpression.callee.property.type === "Identifier" ? macroExpression.callee.property.name : "css";
 					(rootMap.get(root).defineStyle ??= []).push({
 						expression: macroExpression,
-						isDeclaration: node.type === "VariableDeclaration",
+						isCssModules: node.type === "VariableDeclaration",
 						lang
 					});
-				} else if (options.defineSlots.alias.includes(macroName)) rootMap.get(root).defineSlots = macroExpression;
+				} else if (options.defineSlots.alias.includes(macroName)) rootMap.get(root).defineSlots = {
+					expression: macroExpression,
+					id: node.type === "VariableDeclaration" ? node.declarations[0].id : void 0
+				};
 				else if (options.defineExpose.alias.includes(macroName)) rootMap.get(root).defineExpose = macroExpression;
 			}
 		},

package/dist/{core-B_EM_kTA.js → core-CHBxRAvb.js}

@@ -161,9 +161,9 @@ function transformReturn(root, s) {
 
 //#endregion
 //#region src/core/define-component/index.ts
-function transformDefineComponent(root, propsName, map, s, autoReturnFunction = false) {
-	if (!map.defineComponent) return;
-	const defineComponentName = s.sliceNode(map.defineComponent.callee);
+function transformDefineComponent(root, propsName, macros, s, autoReturnFunction = false) {
+	if (!macros.defineComponent) return;
+	const defineComponentName = s.sliceNode(macros.defineComponent.callee);
 	if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) importHelperFn(s, 0, "defineComponent", defineComponentName);
 	let hasRestProp = false;
 	const props = {};
@@ -203,10 +203,10 @@ function transformDefineComponent(root, propsName, map, s, autoReturnFunction =
 			});
 		}
 	}
-	transformDefineModel$1(s, map.defineModel, props);
+	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
-		const argument = map.defineComponent.arguments[1];
+		const argument = macros.defineComponent.arguments[1];
 		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
 		else if (argument.type === "ObjectExpression") {
 			prependObjectExpression(argument, "props", `{\n${propsString}\n}`, s);
@@ -315,8 +315,8 @@ function transformDefineSlots(node, s) {
 
 //#endregion
 //#region src/core/define-style.ts
-function transformDefineStyle(defineStyle, index, root, s, importMap) {
-	const { expression, lang, isDeclaration } = defineStyle;
+function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSlots }) {
+	const { expression, lang, isCssModules } = defineStyle;
 	if (expression.arguments[0]?.type !== "TemplateLiteral") return;
 	let css = s.sliceNode(expression.arguments[0]).slice(1, -1);
 	const scopeId = hash(css);
@@ -338,15 +338,25 @@ function transformDefineStyle(defineStyle, index, root, s, importMap) {
 	if (expression.arguments[1]?.type === "ObjectExpression") {
 		for (const prop of expression.arguments[1].properties) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && prop.key.name === "scoped" && prop.value.type === "BooleanLiteral") scoped = prop.value.value;
 	}
-	if (scoped && returnExpression) walkAST(returnExpression, { enter(node) {
-		if (node.type === "JSXElement" && s.sliceNode(node.openingElement.name) !== "template") s.appendRight(node.openingElement.name.end, ` data-v-${scopeId}=""`);
-	} });
+	if (scoped && root) {
+		const slotNames = defineSlots?.id ? defineSlots.id.type === "Identifier" ? defineSlots.id.name : defineSlots.id.type === "ObjectPattern" ? defineSlots.id.properties.map((prop) => s.sliceNode(prop.type === "RestElement" ? prop.argument : prop.value)) : [] : [];
+		walkAST(root, { enter(node) {
+			if (node.type === "JSXElement" && s.sliceNode(node.openingElement.name) !== "template") {
+				let subfix = "";
+				if (slotNames.length) {
+					const name = s.sliceNode(node.openingElement.name.type === "JSXMemberExpression" ? node.openingElement.name.object : node.openingElement.name);
+					subfix = slotNames.includes(name) ? "-s" : "";
+				}
+				s.appendRight(node.openingElement.name.end, ` data-v-${scopeId}${subfix}=""`);
+			}
+		} });
+	}
 	css = s.sliceNode(expression.arguments[0]).slice(1, -1).replaceAll(/\/\/(.*)(?=\n)/g, "/*$1*/");
-	const module = isDeclaration ? "module." : "";
+	const module = isCssModules ? "module." : "";
 	const importId = `${helperPrefix}/define-style/${index}?scopeId=${scopeId}&scoped=${scoped}&lang.${module}${lang}`;
 	importMap.set(importId, css);
-	s.appendLeft(0, isDeclaration ? `import style${index} from "${importId}";` : `import "${importId}";`);
-	s.overwriteNode(expression, isDeclaration ? `style${index}` : "");
+	s.appendLeft(0, isCssModules ? `import style${index} from "${importId}";` : `import "${importId}";`);
+	s.overwriteNode(expression, isCssModules ? `style${index}` : "");
 }
 function getReturnStatement(root) {
 	if (root.body.type === "BlockStatement") {
@@ -367,9 +377,9 @@ function transformJsxMacros(code, id, importMap, options) {
 	const ast = babelParse(s.original, getLang(id));
 	const rootMap = getRootMap(ast, s, options);
 	let defineStyleIndex = 0;
-	for (const [root, map] of rootMap) {
-		map.defineStyle?.forEach((defineStyle) => {
-			transformDefineStyle(defineStyle, defineStyleIndex++, root, s, importMap);
+	for (const [root, macros] of rootMap) {
+		macros.defineStyle?.forEach((defineStyle) => {
+			transformDefineStyle(defineStyle, defineStyleIndex++, root, s, importMap, macros);
 		});
 		if (root === void 0) continue;
 		let propsName = `${HELPER_PREFIX}props`;
@@ -377,16 +387,16 @@ function transformJsxMacros(code, id, importMap, options) {
 			if (root.params[0].type === "Identifier") propsName = root.params[0].name;
 			else if (root.params[0].type === "ObjectPattern") {
 				const lastProp = root.params[0].properties.at(-1);
-				if (!map.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
+				if (!macros.defineComponent && lastProp?.type === "RestElement" && lastProp.argument.type === "Identifier") propsName = lastProp.argument.name;
 				else s.appendRight(root.params[0].extra?.trailingComma ? root.params[0].extra?.trailingComma + 1 : lastProp?.end || root.params[0].end - 1, `${!root.params[0].extra?.trailingComma && root.params[0].properties.length ? "," : ""} ...${HELPER_PREFIX}props`);
 			}
 		} else s.appendRight(getParamsStart(root, s.original), propsName);
-		if (map.defineComponent) transformDefineComponent(root, propsName, map, s, options.defineComponent?.autoReturnFunction);
-		if (map.defineModel?.length) map.defineModel.forEach(({ expression }) => {
+		if (macros.defineComponent) transformDefineComponent(root, propsName, macros, s, options.defineComponent?.autoReturnFunction);
+		if (macros.defineModel?.length) macros.defineModel.forEach(({ expression }) => {
 			transformDefineModel(expression, propsName, s);
 		});
-		if (map.defineSlots) transformDefineSlots(map.defineSlots, s);
-		if (map.defineExpose) transformDefineExpose(map.defineExpose, s, options.version);
+		if (macros.defineSlots) transformDefineSlots(macros.defineSlots.expression, s);
+		if (macros.defineExpose) transformDefineExpose(macros.defineExpose, s, options.version);
 	}
 	return generateTransform(s, id);
 }
@@ -416,10 +426,13 @@ function getRootMap(ast, s, options) {
 					const lang = macroExpression.callee.type === "MemberExpression" && macroExpression.callee.property.type === "Identifier" ? macroExpression.callee.property.name : "css";
 					(rootMap.get(root).defineStyle ??= []).push({
 						expression: macroExpression,
-						isDeclaration: node.type === "VariableDeclaration",
+						isCssModules: node.type === "VariableDeclaration",
 						lang
 					});
-				} else if (options.defineSlots.alias.includes(macroName)) rootMap.get(root).defineSlots = macroExpression;
+				} else if (options.defineSlots.alias.includes(macroName)) rootMap.get(root).defineSlots = {
+					expression: macroExpression,
+					id: node.type === "VariableDeclaration" ? node.declarations[0].id : void 0
+				};
 				else if (options.defineExpose.alias.includes(macroName)) rootMap.get(root).defineExpose = macroExpression;
 			}
 		},

package/dist/esbuild.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/esbuild.ts
 var esbuild_default = src_default.esbuild;

package/dist/index.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 const require_options = require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 exports.default = require_src.src_default
 exports.resolveOptions = require_options.resolveOptions

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 export { src_default as default, resolveOptions };

package/dist/nuxt.cjs

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-require('./src-BSxhhMQG.cjs');
-const require_vite = require('./vite-DduBOkgt.cjs');
-const require_webpack = require('./webpack-DoGvibWq.cjs');
+require('./src-2EUAmvRo.cjs');
+const require_vite = require('./vite-DP98E6od.cjs');
+const require_webpack = require('./webpack-qmJC3FBB.cjs');
 const __nuxt_kit = require_chunk.__toESM(require("@nuxt/kit"));
 require("@nuxt/schema");
 

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import "./src-Biftgb4Y.js";
-import { vite_default } from "./vite-BOk2nx8R.js";
-import { webpack_default } from "./webpack-D_e7IjTv.js";
+import "./src-BDMVJUXS.js";
+import { vite_default } from "./vite-CS2vynmi.js";
+import { webpack_default } from "./webpack-C78RZrII.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/{raw-CgNsul_i.cjs → raw-BXpT71mV.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_core = require('./core-CdPKEM79.cjs');
+const require_core = require('./core-C740HxiF.cjs');
 const require_options = require('./options-BSX_vMxh.cjs');
 const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
 const __vue_compiler_sfc = require_chunk.__toESM(require("@vue/compiler-sfc"));

package/dist/{raw-BKMhH7EF.js → raw-Hr7QYA0U.js}

@@ -1,4 +1,4 @@
-import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-B_EM_kTA.js";
+import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-CHBxRAvb.js";
 import { resolveOptions } from "./options-BWRkHmm5.js";
 import { createFilter, normalizePath } from "@vue-macros/common";
 import { compileStyleAsync } from "@vue/compiler-sfc";

package/dist/raw.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-const require_raw = require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+const require_raw = require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
 
 exports.default = require_raw.raw_default

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-B_EM_kTA.js";
-import { raw_default } from "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import { raw_default } from "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
 
 export { raw_default as default };

package/dist/rolldown.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/rolldown.ts
 var rolldown_default = src_default.rolldown;

package/dist/rollup.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/rollup.ts
 var rollup_default = src_default.rollup;

package/dist/rspack.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/{src-BSxhhMQG.cjs → src-2EUAmvRo.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_raw = require('./raw-CgNsul_i.cjs');
+const require_raw = require('./raw-BXpT71mV.cjs');
 const unplugin = require_chunk.__toESM(require("unplugin"));
 
 //#region src/index.ts

package/dist/{src-Biftgb4Y.js → src-BDMVJUXS.js}

@@ -1,4 +1,4 @@
-import { raw_default } from "./raw-BKMhH7EF.js";
+import { raw_default } from "./raw-Hr7QYA0U.js";
 import { createUnplugin } from "unplugin";
 
 //#region src/index.ts

package/dist/{vite-BOk2nx8R.js → vite-CS2vynmi.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/vite.ts
 var vite_default = src_default.vite;

package/dist/{vite-DduBOkgt.cjs → vite-DP98E6od.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/vite.ts
 var vite_default = require_src.src_default.vite;

package/dist/vite.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-require('./src-BSxhhMQG.cjs');
-const require_vite = require('./vite-DduBOkgt.cjs');
+require('./src-2EUAmvRo.cjs');
+const require_vite = require('./vite-DP98E6od.cjs');
 
 exports.default = require_vite.vite_default

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import "./src-Biftgb4Y.js";
-import { vite_default } from "./vite-BOk2nx8R.js";
+import "./src-BDMVJUXS.js";
+import { vite_default } from "./vite-CS2vynmi.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -4,8 +4,6 @@ const require_chunk = require('./chunk-BCwAaXi7.cjs');
 const require_options = require('./options-BSX_vMxh.cjs');
 const __vue_macros_common = require_chunk.__toESM(require("@vue-macros/common"));
 const ts_macro = require_chunk.__toESM(require("ts-macro"));
-const __vue_language_core_lib_codegen_style_classProperty_js = require_chunk.__toESM(require("@vue/language-core/lib/codegen/style/classProperty.js"));
-const __vue_language_core_lib_utils_parseCssClassNames_js = require_chunk.__toESM(require("@vue/language-core/lib/utils/parseCssClassNames.js"));
 
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
@@ -27,16 +25,10 @@ function transformDefineComponent(node, parent, options) {
 
 //#endregion
 //#region src/volar/define-style.ts
-function transformDefineStyle(defineStyles, options) {
-	if (!defineStyles?.length) return;
+function transformDefineStyle({ expression, isCssModules }, index, options) {
 	const { ts, codes, ast } = options;
-	defineStyles.forEach(({ expression, isCssModules }, index) => {
-		if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) (0, ts_macro.replaceRange)(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<${__vue_macros_common.HELPER_PREFIX}PrettifyLocal<{}`, ...generateCssClassesType(expression.arguments[0].getText(ast).slice(1, -1), expression.arguments[0].getStart(ast) + 1, index), ">>");
-		addEmbeddedCode(expression, index, options);
-	});
-}
-function* generateCssClassesType(css, offset, index) {
-	for (const className of [...(0, __vue_language_core_lib_utils_parseCssClassNames_js.parseCssClassNames)(css)]) yield* (0, __vue_language_core_lib_codegen_style_classProperty_js.generateClassProperty)(index, className.text, className.offset + offset, "string");
+	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) (0, ts_macro.replaceRange)(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).map(({ text }) => `\n'${text.slice(1)}': string`), "\n}>");
+	addEmbeddedCode(expression, index, options);
 }
 function addEmbeddedCode(expression, index, options) {
 	const { ts, ast } = options;
@@ -67,16 +59,33 @@ function addEmbeddedCode(expression, index, options) {
 		embeddedCodes: []
 	});
 }
+const commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
+const cssClassNameReg = /(?=(\.[a-z_][-\w]*)[\s.,+~>:#)[{])/gi;
+const fragmentReg = /(?<=\{)[^{]*(?=(?<!\\);)/g;
+function parseCssClassNames(css) {
+	for (const reg of [commentReg, fragmentReg]) css = css.replace(reg, (match) => " ".repeat(match.length));
+	const matches = css.matchAll(cssClassNameReg);
+	const result = [];
+	for (const match of matches) {
+		const matchText = match[1];
+		if (matchText) result.push({
+			offset: match.index,
+			text: matchText
+		});
+	}
+	return result;
+}
 
 //#endregion
 //#region src/volar/transform.ts
 function transformJsxMacros(rootMap, options) {
 	const { ts, codes, ast } = options;
-	for (const [root, map] of rootMap) {
-		transformDefineStyle(map.defineStyle, options);
+	let defineStyleIndex = 0;
+	for (const [root, macros] of rootMap) {
+		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
 		if (!root?.body) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
-		if (asyncModifier && map.defineComponent) (0, ts_macro.replaceRange)(codes, asyncModifier.pos, asyncModifier.end);
+		if (asyncModifier && macros.defineComponent) (0, ts_macro.replaceRange)(codes, asyncModifier.pos, asyncModifier.end);
 		const result = `({}) as __VLS_PickNotAny<typeof ${__vue_macros_common.HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${__vue_macros_common.HELPER_PREFIX}ctx }`;
 		const propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
 		(0, ts_macro.replaceRange)(codes, root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `${__vue_macros_common.HELPER_PREFIX}props: typeof ${__vue_macros_common.HELPER_PREFIX}ctx.props & ${propsType}, `, `${__vue_macros_common.HELPER_PREFIX}placeholder?: {}, `, `${__vue_macros_common.HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${__vue_macros_common.HELPER_PREFIX}setup>>, `, `${__vue_macros_common.HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`);
@@ -87,16 +96,16 @@ function transformJsxMacros(rootMap, options) {
 		}
 		ts.forEachChild(root.body, (node) => {
 			if (ts.isReturnStatement(node) && node.expression) {
-				const props = [...map.defineModel ?? []];
+				const props = [...macros.defineModel ?? []];
 				const elements = root.parameters[0] && !root.parameters[0].type && ts.isObjectBindingPattern(root.parameters[0].name) ? root.parameters[0].name.elements : [];
 				for (const element of elements) if (ts.isIdentifier(element.name)) props.push(`${element.name.escapedText}${element.initializer && ts.isNonNullExpression(element.initializer) ? ":" : "?:"} typeof ${element.name.escapedText}`);
-				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && map.defineComponent;
+				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
 				(0, ts_macro.replaceRange)(codes, node.getStart(ast), node.expression.getStart(ast), `const ${__vue_macros_common.HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
 				(0, ts_macro.replaceRange)(codes, node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
 return {
   props: {} as {${props.join(", ")}},
-  slots: {} as ${map.defineSlots ?? "{}"},
-  expose: (exposed: import('vue').ShallowUnwrapRef<${map.defineExpose ?? "{}"}>) => {},
+  slots: {} as ${macros.defineSlots ?? "{}"},
+  expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => {},
   render: ${__vue_macros_common.HELPER_PREFIX}render,
 }`);
 			}
@@ -118,7 +127,6 @@ ${defineSlots}
 ${defineExpose}
 ${defineStyle}
 type ${__vue_macros_common.HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
-type ${__vue_macros_common.HELPER_PREFIX}PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {};
 // @ts-ignore
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
@@ -165,11 +173,6 @@ function getRootMap(options) {
 	const { ts, ast, codes } = options;
 	const rootMap = new Map();
 	function walk(node, parents) {
-		ts.forEachChild(node, (child) => {
-			parents.unshift(node);
-			walk(child, parents);
-			parents.shift();
-		});
 		const root = parents[1] && (ts.isArrowFunction(parents[1]) || ts.isFunctionExpression(parents[1]) || ts.isFunctionDeclaration(parents[1])) ? parents[1] : void 0;
 		if (root && parents[2] && ts.isCallExpression(parents[2]) && !parents[2].typeArguments && options.defineComponent.alias.includes(parents[2].expression.getText(ast))) {
 			if (!rootMap.has(root)) rootMap.set(root, {});
@@ -179,40 +182,50 @@ function getRootMap(options) {
 			}
 		}
 		const macro = getMacro(node, ts, options);
-		if (!macro) return;
-		const { expression, initializer } = macro;
-		let isRequired = macro.isRequired;
-		if (!rootMap.has(root)) rootMap.set(root, {});
-		const macroName = expression.expression.getText(ast);
-		if (macroName.startsWith("defineStyle")) (rootMap.get(root).defineStyle ??= []).push({
-			expression,
-			isCssModules: !!ts.isVariableStatement(node)
-		});
-		if (!root) return;
-		if (options.defineModel.alias.includes(macroName)) {
-			const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
-			const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
-			if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
-				let hasRequired = false;
-				for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
-					hasRequired = true;
-					isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+		if (macro) {
+			const { expression, initializer } = macro;
+			let isRequired = macro.isRequired;
+			if (!rootMap.has(root)) rootMap.set(root, {});
+			const macroName = expression.expression.getText(ast);
+			if (macroName.startsWith("defineStyle")) {
+				(rootMap.get(root).defineStyle ??= []).push({
+					expression,
+					isCssModules: ts.isVariableStatement(node)
+				});
+				return;
+			}
+			if (root) {
+				if (options.defineModel.alias.includes(macroName)) {
+					const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
+					const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
+					if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
+						let hasRequired = false;
+						for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
+							hasRequired = true;
+							isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+						}
+						if (!hasRequired && isRequired) (0, ts_macro.replaceRange)(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
+					} else if (isRequired) (0, ts_macro.replaceRange)(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
+					const id = toValidAssetId(modelName, `${__vue_macros_common.HELPER_PREFIX}model`);
+					const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
+					const defineModel = rootMap.get(root).defineModel ??= [];
+					defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
+					if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
+					if (ts.isVariableStatement(node)) (0, ts_macro.replaceRange)(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+				} else if (options.defineSlots.alias.includes(macroName)) {
+					(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}slots;\nconst ${__vue_macros_common.HELPER_PREFIX}slots = `);
+					rootMap.get(root).defineSlots = `Partial<typeof ${__vue_macros_common.HELPER_PREFIX}slots>`;
+				} else if (options.defineExpose.alias.includes(macroName)) {
+					(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}exposed;\nconst ${__vue_macros_common.HELPER_PREFIX}exposed = `);
+					rootMap.get(root).defineExpose = `typeof ${__vue_macros_common.HELPER_PREFIX}exposed`;
 				}
-				if (!hasRequired && isRequired) (0, ts_macro.replaceRange)(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
-			} else if (isRequired) (0, ts_macro.replaceRange)(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
-			const id = toValidAssetId(modelName, `${__vue_macros_common.HELPER_PREFIX}model`);
-			const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
-			const defineModel = rootMap.get(root).defineModel ??= [];
-			defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
-			if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
-			(0, ts_macro.replaceRange)(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
-		} else if (options.defineSlots.alias.includes(macroName)) {
-			(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}slots;\nconst ${__vue_macros_common.HELPER_PREFIX}slots = `);
-			rootMap.get(root).defineSlots = `Partial<typeof ${__vue_macros_common.HELPER_PREFIX}slots>`;
-		} else if (options.defineExpose.alias.includes(macroName)) {
-			(0, ts_macro.replaceRange)(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${__vue_macros_common.HELPER_PREFIX}exposed;\nconst ${__vue_macros_common.HELPER_PREFIX}exposed = `);
-			rootMap.get(root).defineExpose = `typeof ${__vue_macros_common.HELPER_PREFIX}exposed`;
+			}
 		}
+		ts.forEachChild(node, (child) => {
+			parents.unshift(node);
+			walk(child, parents);
+			parents.shift();
+		});
 	}
 	ts.forEachChild(ast, (node) => walk(node, []));
 	return rootMap;

package/dist/volar.js

@@ -1,8 +1,6 @@
 import { resolveOptions } from "./options-BWRkHmm5.js";
 import { HELPER_PREFIX, createFilter } from "@vue-macros/common";
 import { allCodeFeatures, createPlugin, replaceRange } from "ts-macro";
-import { generateClassProperty } from "@vue/language-core/lib/codegen/style/classProperty.js";
-import { parseCssClassNames } from "@vue/language-core/lib/utils/parseCssClassNames.js";
 
 //#region src/volar/define-component.ts
 function transformDefineComponent(node, parent, options) {
@@ -24,16 +22,10 @@ function transformDefineComponent(node, parent, options) {
 
 //#endregion
 //#region src/volar/define-style.ts
-function transformDefineStyle(defineStyles, options) {
-	if (!defineStyles?.length) return;
+function transformDefineStyle({ expression, isCssModules }, index, options) {
 	const { ts, codes, ast } = options;
-	defineStyles.forEach(({ expression, isCssModules }, index) => {
-		if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) replaceRange(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<${HELPER_PREFIX}PrettifyLocal<{}`, ...generateCssClassesType(expression.arguments[0].getText(ast).slice(1, -1), expression.arguments[0].getStart(ast) + 1, index), ">>");
-		addEmbeddedCode(expression, index, options);
-	});
-}
-function* generateCssClassesType(css, offset, index) {
-	for (const className of [...parseCssClassNames(css)]) yield* generateClassProperty(index, className.text, className.offset + offset, "string");
+	if (isCssModules && expression?.arguments[0] && !expression.typeArguments && ts.isTemplateLiteral(expression.arguments[0])) replaceRange(codes, expression.arguments.pos - 1, expression.arguments.pos - 1, `<{`, ...parseCssClassNames(expression.arguments[0].getText(ast).slice(1, -1)).map(({ text }) => `\n'${text.slice(1)}': string`), "\n}>");
+	addEmbeddedCode(expression, index, options);
 }
 function addEmbeddedCode(expression, index, options) {
 	const { ts, ast } = options;
@@ -64,16 +56,33 @@ function addEmbeddedCode(expression, index, options) {
 		embeddedCodes: []
 	});
 }
+const commentReg = /(?<=\/\*)[\s\S]*?(?=\*\/)|(?<=\/\/)[\s\S]*?(?=\n)/g;
+const cssClassNameReg = /(?=(\.[a-z_][-\w]*)[\s.,+~>:#)[{])/gi;
+const fragmentReg = /(?<=\{)[^{]*(?=(?<!\\);)/g;
+function parseCssClassNames(css) {
+	for (const reg of [commentReg, fragmentReg]) css = css.replace(reg, (match) => " ".repeat(match.length));
+	const matches = css.matchAll(cssClassNameReg);
+	const result = [];
+	for (const match of matches) {
+		const matchText = match[1];
+		if (matchText) result.push({
+			offset: match.index,
+			text: matchText
+		});
+	}
+	return result;
+}
 
 //#endregion
 //#region src/volar/transform.ts
 function transformJsxMacros(rootMap, options) {
 	const { ts, codes, ast } = options;
-	for (const [root, map] of rootMap) {
-		transformDefineStyle(map.defineStyle, options);
+	let defineStyleIndex = 0;
+	for (const [root, macros] of rootMap) {
+		macros.defineStyle?.forEach((defaultStyle) => transformDefineStyle(defaultStyle, defineStyleIndex++, options));
 		if (!root?.body) continue;
 		const asyncModifier = root.modifiers?.find((modifier) => modifier.kind === ts.SyntaxKind.AsyncKeyword);
-		if (asyncModifier && map.defineComponent) replaceRange(codes, asyncModifier.pos, asyncModifier.end);
+		if (asyncModifier && macros.defineComponent) replaceRange(codes, asyncModifier.pos, asyncModifier.end);
 		const result = `({}) as __VLS_PickNotAny<typeof ${HELPER_PREFIX}ctx.render, {}> & { __ctx: typeof ${HELPER_PREFIX}ctx }`;
 		const propsType = root.parameters[0]?.type ? String(root.parameters[0].type.getText(ast)) : "{}";
 		replaceRange(codes, root.parameters.pos, root.parameters.pos, ts.isArrowFunction(root) && root.parameters.pos === root.pos ? "(" : "", `${HELPER_PREFIX}props: typeof ${HELPER_PREFIX}ctx.props & ${propsType}, `, `${HELPER_PREFIX}placeholder?: {}, `, `${HELPER_PREFIX}ctx = {} as Awaited<ReturnType<typeof ${HELPER_PREFIX}setup>>, `, `${HELPER_PREFIX}setup = (${asyncModifier ? "async" : ""}(`);
@@ -84,16 +93,16 @@ function transformJsxMacros(rootMap, options) {
 		}
 		ts.forEachChild(root.body, (node) => {
 			if (ts.isReturnStatement(node) && node.expression) {
-				const props = [...map.defineModel ?? []];
+				const props = [...macros.defineModel ?? []];
 				const elements = root.parameters[0] && !root.parameters[0].type && ts.isObjectBindingPattern(root.parameters[0].name) ? root.parameters[0].name.elements : [];
 				for (const element of elements) if (ts.isIdentifier(element.name)) props.push(`${element.name.escapedText}${element.initializer && ts.isNonNullExpression(element.initializer) ? ":" : "?:"} typeof ${element.name.escapedText}`);
-				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && map.defineComponent;
+				const shouldWrapByCall = (ts.isArrowFunction(node.expression) || ts.isFunctionExpression(node.expression)) && macros.defineComponent;
 				replaceRange(codes, node.getStart(ast), node.expression.getStart(ast), `const ${HELPER_PREFIX}render = `, shouldWrapByCall ? "(" : "");
 				replaceRange(codes, node.expression.end, node.expression.end, shouldWrapByCall ? ")()" : "", `
 return {
   props: {} as {${props.join(", ")}},
-  slots: {} as ${map.defineSlots ?? "{}"},
-  expose: (exposed: import('vue').ShallowUnwrapRef<${map.defineExpose ?? "{}"}>) => {},
+  slots: {} as ${macros.defineSlots ?? "{}"},
+  expose: (exposed: import('vue').ShallowUnwrapRef<${macros.defineExpose ?? "{}"}>) => {},
   render: ${HELPER_PREFIX}render,
 }`);
 			}
@@ -115,7 +124,6 @@ ${defineSlots}
 ${defineExpose}
 ${defineStyle}
 type ${HELPER_PREFIX}StyleArgs = [style: string, options?: { scoped?: boolean }];
-type ${HELPER_PREFIX}PrettifyLocal<T> = { [K in keyof T]: T[K]; } & {};
 // @ts-ignore
 type __VLS_IsAny<T> = 0 extends 1 & T ? true : false; type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
 `;
@@ -162,11 +170,6 @@ function getRootMap(options) {
 	const { ts, ast, codes } = options;
 	const rootMap = new Map();
 	function walk(node, parents) {
-		ts.forEachChild(node, (child) => {
-			parents.unshift(node);
-			walk(child, parents);
-			parents.shift();
-		});
 		const root = parents[1] && (ts.isArrowFunction(parents[1]) || ts.isFunctionExpression(parents[1]) || ts.isFunctionDeclaration(parents[1])) ? parents[1] : void 0;
 		if (root && parents[2] && ts.isCallExpression(parents[2]) && !parents[2].typeArguments && options.defineComponent.alias.includes(parents[2].expression.getText(ast))) {
 			if (!rootMap.has(root)) rootMap.set(root, {});
@@ -176,40 +179,50 @@ function getRootMap(options) {
 			}
 		}
 		const macro = getMacro(node, ts, options);
-		if (!macro) return;
-		const { expression, initializer } = macro;
-		let isRequired = macro.isRequired;
-		if (!rootMap.has(root)) rootMap.set(root, {});
-		const macroName = expression.expression.getText(ast);
-		if (macroName.startsWith("defineStyle")) (rootMap.get(root).defineStyle ??= []).push({
-			expression,
-			isCssModules: !!ts.isVariableStatement(node)
-		});
-		if (!root) return;
-		if (options.defineModel.alias.includes(macroName)) {
-			const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
-			const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
-			if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
-				let hasRequired = false;
-				for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
-					hasRequired = true;
-					isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+		if (macro) {
+			const { expression, initializer } = macro;
+			let isRequired = macro.isRequired;
+			if (!rootMap.has(root)) rootMap.set(root, {});
+			const macroName = expression.expression.getText(ast);
+			if (macroName.startsWith("defineStyle")) {
+				(rootMap.get(root).defineStyle ??= []).push({
+					expression,
+					isCssModules: ts.isVariableStatement(node)
+				});
+				return;
+			}
+			if (root) {
+				if (options.defineModel.alias.includes(macroName)) {
+					const modelName = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[0].text : "modelValue";
+					const modelOptions = expression.arguments[0] && ts.isStringLiteralLike(expression.arguments[0]) ? expression.arguments[1] : expression.arguments[0];
+					if (modelOptions && ts.isObjectLiteralExpression(modelOptions)) {
+						let hasRequired = false;
+						for (const prop of modelOptions.properties) if (ts.isPropertyAssignment(prop) && prop.name.getText(ast) === "required") {
+							hasRequired = true;
+							isRequired = prop.initializer.kind === ts.SyntaxKind.TrueKeyword;
+						}
+						if (!hasRequired && isRequired) replaceRange(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
+					} else if (isRequired) replaceRange(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
+					const id = toValidAssetId(modelName, `${HELPER_PREFIX}model`);
+					const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
+					const defineModel = rootMap.get(root).defineModel ??= [];
+					defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
+					if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
+					if (ts.isVariableStatement(node)) replaceRange(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
+				} else if (options.defineSlots.alias.includes(macroName)) {
+					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
+					rootMap.get(root).defineSlots = `Partial<typeof ${HELPER_PREFIX}slots>`;
+				} else if (options.defineExpose.alias.includes(macroName)) {
+					replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
+					rootMap.get(root).defineExpose = `typeof ${HELPER_PREFIX}exposed`;
 				}
-				if (!hasRequired && isRequired) replaceRange(codes, modelOptions.end - 1, modelOptions.end - 1, `${!modelOptions.properties.hasTrailingComma && modelOptions.properties.length ? "," : ""} required: true`);
-			} else if (isRequired) replaceRange(codes, expression.arguments.end, expression.arguments.end, `${!expression.arguments.hasTrailingComma && expression.arguments.length ? "," : ""} { required: true }`);
-			const id = toValidAssetId(modelName, `${HELPER_PREFIX}model`);
-			const typeString = `import('vue').UnwrapRef<typeof ${id}>`;
-			const defineModel = rootMap.get(root).defineModel ??= [];
-			defineModel.push(`${modelName.includes("-") ? `'${modelName}'` : modelName}${isRequired ? ":" : "?:"} ${typeString}`, `'onUpdate:${modelName}'?: ($event: ${typeString}) => any`);
-			if (expression.typeArguments?.[1]) defineModel.push(`${modelName}Modifiers?: Partial<Record<${expression.typeArguments[1].getText(ast)}, boolean>>`);
-			replaceRange(codes, initializer.getStart(ast), initializer.getStart(ast), `// @ts-ignore\n${id};\nlet ${id} = `);
-		} else if (options.defineSlots.alias.includes(macroName)) {
-			replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}slots;\nconst ${HELPER_PREFIX}slots = `);
-			rootMap.get(root).defineSlots = `Partial<typeof ${HELPER_PREFIX}slots>`;
-		} else if (options.defineExpose.alias.includes(macroName)) {
-			replaceRange(codes, expression.getStart(ast), expression.getStart(ast), `// @ts-ignore\n${HELPER_PREFIX}exposed;\nconst ${HELPER_PREFIX}exposed = `);
-			rootMap.get(root).defineExpose = `typeof ${HELPER_PREFIX}exposed`;
+			}
 		}
+		ts.forEachChild(node, (child) => {
+			parents.unshift(node);
+			walk(child, parents);
+			parents.shift();
+		});
 	}
 	ts.forEachChild(ast, (node) => walk(node, []));
 	return rootMap;

package/dist/{webpack-D_e7IjTv.js → webpack-C78RZrII.js}

@@ -1,4 +1,4 @@
-import { src_default } from "./src-Biftgb4Y.js";
+import { src_default } from "./src-BDMVJUXS.js";
 
 //#region src/webpack.ts
 var webpack_default = src_default.webpack;

package/dist/{webpack-DoGvibWq.cjs → webpack-qmJC3FBB.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-const require_src = require('./src-BSxhhMQG.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/webpack.ts
 var webpack_default = require_src.src_default.webpack;

package/dist/webpack.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdPKEM79.cjs');
-require('./raw-CgNsul_i.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
 require('./options-BSX_vMxh.cjs');
-require('./src-BSxhhMQG.cjs');
-const require_webpack = require('./webpack-DoGvibWq.cjs');
+require('./src-2EUAmvRo.cjs');
+const require_webpack = require('./webpack-qmJC3FBB.cjs');
 
 exports.default = require_webpack.webpack_default

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-BKMhH7EF.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
 import "./options-BWRkHmm5.js";
-import "./src-Biftgb4Y.js";
-import { webpack_default } from "./webpack-D_e7IjTv.js";
+import "./src-BDMVJUXS.js";
+import { webpack_default } from "./webpack-C78RZrII.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.3.4",
+  "version": "2.3.6",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [
@@ -167,11 +167,10 @@
     }
   },
   "dependencies": {
-    "@vue-macros/common": "^3.0.0-beta.10",
-    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@42f38ca",
-    "@vue/language-core": "^2.2.8",
+    "@vue-macros/common": "^3.0.0-beta.12",
+    "@vue/compiler-sfc": "https://pkg.pr.new/@vue/compiler-sfc@d386396",
     "hash-sum": "^2.0.0",
-    "ts-macro": "^0.1.25",
+    "ts-macro": "^0.1.29",
     "unplugin": "^2.2.2"
   },
   "devDependencies": {
@@ -179,8 +178,8 @@
     "@nuxt/kit": "^3.16.0",
     "@nuxt/schema": "^3.16.0",
     "@types/hash-sum": "^1.0.2",
-    "@vue-macros/test-utils": "^3.0.0-beta.10",
-    "vue": "https://pkg.pr.new/vue@42f38ca"
+    "@vue-macros/test-utils": "^3.0.0-beta.12",
+    "vue": "https://pkg.pr.new/vue@d386396"
   },
   "scripts": {
     "build": "tsdown",