@vue-jsx-vapor/macros 2.3.3 → 2.3.5

package/dist/options.d.cts

@@ -1,3 +1,3 @@
-import { Options, OptionsResolved, resolveOptions } from "./options.d-B3WOiT_L.cjs";
+import { Options, OptionsResolved, resolveOptions } from "./options.d-CXMsJZSo.cjs";
 
 export { Options, OptionsResolved, resolveOptions };

package/dist/options.d.ts

@@ -1,3 +1,3 @@
-import { Options, OptionsResolved, resolveOptions$1 as resolveOptions } from "./options.d-DtyRfe-9.js";
+import { Options, OptionsResolved, resolveOptions$1 as resolveOptions } from "./options.d-DNWXuL_g.js";
 
 export { Options, OptionsResolved, resolveOptions };

package/dist/options.js

@@ -1,3 +1,3 @@
-import { resolveOptions } from "./options-pbSvpKdV.js";
+import { resolveOptions } from "./options-BWRkHmm5.js";
 
 export { resolveOptions };

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

@@ -1,7 +1,7 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_core = require('./core-CdPKEM79.cjs');
-const require_options = require('./options-CNIhAQHD.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-9H5vTeLe.js → raw-Hr7QYA0U.js}

@@ -1,5 +1,5 @@
-import { helperPrefix, transformJsxMacros, useModelHelperId, use_model_default, withDefaultsHelperId, with_defaults_default } from "./core-B_EM_kTA.js";
-import { resolveOptions } from "./options-pbSvpKdV.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-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.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.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 import { UnpluginOptions } from "unplugin";
 
 //#region src/raw.d.ts

package/dist/raw.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 import { UnpluginOptions } from "unplugin";
 
 //#region src/raw.d.ts

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-B_EM_kTA.js";
-import { raw_default } from "./raw-9H5vTeLe.js";
-import "./options-pbSvpKdV.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-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-CY9FOMwg.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
+require('./options-BSX_vMxh.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 
 //#region src/rolldown.d.ts
 declare const _default: (options?: Options | undefined) => any;

package/dist/rolldown.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 
 //#region src/rolldown.d.ts
 declare const _default: (options?: Options | undefined) => any;

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-9H5vTeLe.js";
-import "./options-pbSvpKdV.js";
-import { src_default } from "./src-CjDaDFw_.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
+import "./options-BWRkHmm5.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-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-CY9FOMwg.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
+require('./options-BSX_vMxh.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 import { Plugin } from "rollup";
 
 //#region src/rollup.d.ts

package/dist/rollup.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 import { Plugin } from "rollup";
 
 //#region src/rollup.d.ts

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-9H5vTeLe.js";
-import "./options-pbSvpKdV.js";
-import { src_default } from "./src-CjDaDFw_.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
+import "./options-BWRkHmm5.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-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-CY9FOMwg.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
+require('./options-BSX_vMxh.cjs');
+const require_src = require('./src-2EUAmvRo.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;

package/dist/rspack.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 
 //#region src/rspack.d.ts
 declare const _default: (options?: Options | undefined) => RspackPluginInstance;

package/dist/rspack.js

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

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

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

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

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

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

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

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

@@ -1,5 +1,5 @@
 "use strict";
-const require_src = require('./src-CY9FOMwg.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-oJpqvj1N.cjs');
-require('./options-CNIhAQHD.cjs');
-require('./src-CY9FOMwg.cjs');
-const require_vite = require('./vite-CtRiheet.cjs');
+require('./core-C740HxiF.cjs');
+require('./raw-BXpT71mV.cjs');
+require('./options-BSX_vMxh.cjs');
+require('./src-2EUAmvRo.cjs');
+const require_vite = require('./vite-DP98E6od.cjs');
 
 exports.default = require_vite.vite_default

package/dist/vite.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 import { Plugin } from "vite";
 
 //#region src/vite.d.ts

package/dist/vite.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 import { Plugin } from "vite";
 
 //#region src/vite.d.ts

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-B_EM_kTA.js";
-import "./raw-9H5vTeLe.js";
-import "./options-pbSvpKdV.js";
-import "./src-CjDaDFw_.js";
-import { vite_default } from "./vite-HbXTfQl_.js";
+import "./core-CHBxRAvb.js";
+import "./raw-Hr7QYA0U.js";
+import "./options-BWRkHmm5.js";
+import "./src-BDMVJUXS.js";
+import { vite_default } from "./vite-CS2vynmi.js";
 
 export { vite_default as default };

package/dist/volar.cjs

@@ -1,11 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_options = require('./options-CNIhAQHD.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.d.cts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-B3WOiT_L.cjs";
+import { Options } from "./options.d-CXMsJZSo.cjs";
 import { PluginReturn } from "ts-macro";
 
 //#region src/volar.d.ts

package/dist/volar.d.ts

@@ -1,4 +1,4 @@
-import { Options } from "./options.d-DtyRfe-9.js";
+import { Options } from "./options.d-DNWXuL_g.js";
 import { PluginReturn } from "ts-macro";
 
 //#region src/volar.d.ts