@vue-jsx-vapor/macros 2.3.2 → 2.3.3

package/dist/api.cjs

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

package/dist/api.d.cts

@@ -1,10 +1,11 @@
 import { OptionsResolved } from "./options.d-B3WOiT_L.cjs";
-import { CodeTransform, MagicString } from "@vue-macros/common";
+import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, Node } from "@babel/types";
 
 //#region src/core/restructure.d.ts
 type Options = {
     withDefaultsFrom?: string;
+    skipDefaultProps?: boolean;
     generateRestProps?: (restPropsName: string, index: number, list: Prop[]) => string | undefined;
 };
 type Prop = {
@@ -13,9 +14,8 @@ type Prop = {
     value: string;
     defaultValue?: string;
     isRest?: boolean;
-    isRequired?: boolean;
 };
-declare function restructure(s: MagicString, node: FunctionalNode, options?: Options): Prop[];
+declare function restructure(s: MagicStringAST, node: FunctionalNode, options?: Options): Prop[];
 
 //#endregion
 //#region src/core/index.d.ts

package/dist/api.d.ts

@@ -1,10 +1,11 @@
 import { OptionsResolved } from "./options.d-DtyRfe-9.js";
-import { CodeTransform, MagicString } from "@vue-macros/common";
+import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, Node } from "@babel/types";
 
 //#region src/core/restructure.d.ts
 type Options = {
     withDefaultsFrom?: string;
+    skipDefaultProps?: boolean;
     generateRestProps?: (restPropsName: string, index: number, list: Prop[]) => string | undefined;
 };
 type Prop = {
@@ -13,9 +14,8 @@ type Prop = {
     value: string;
     defaultValue?: string;
     isRest?: boolean;
-    isRequired?: boolean;
 };
-declare function restructure(s: MagicString, node: FunctionalNode, options?: Options): Prop[];
+declare function restructure(s: MagicStringAST, node: FunctionalNode, options?: Options): Prop[];
 
 //#endregion
 //#region src/core/index.d.ts

package/dist/api.js

@@ -1,3 +1,3 @@
-import { getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros } from "./core-cHgZBgtA.js";
+import { getMacroExpression, getParamsStart, isFunctionalNode, restructure, transformJsxMacros } from "./core-B_EM_kTA.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import { src_default } from "./src-BfZoaRPY.js";
+import { src_default } from "./src-CjDaDFw_.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

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

@@ -22,33 +22,28 @@ function restructure(s, node, options = {}) {
 	const propList = [];
 	for (const param of node.params) {
 		const path = `${HELPER_PREFIX}props${index++ || ""}`;
-		const props = getProps(param, path, s, [], options);
+		const props = getProps(s, options, param, path);
 		if (props) {
-			const hasDefaultValue = props.some((i) => i.defaultValue);
 			s.overwrite(param.start, param.end, path);
-			propList.push(...hasDefaultValue ? props.map((i) => ({
-				...i,
-				path: i.path.replace(HELPER_PREFIX, `${HELPER_PREFIX}default_`)
-			})) : props);
+			propList.push(...props);
 		}
 	}
 	if (propList.length) {
 		const defaultValues = {};
 		const rests = [];
 		for (const prop of propList) {
+			if (prop.isRest) rests.push(prop);
 			if (prop.defaultValue) {
-				const basePath = prop.path.split(/\.|\[/)[0];
-				(defaultValues[basePath] ??= []).push(prop);
+				const paths = prop.path.split(/\.|\[/);
+				if (!options.skipDefaultProps || paths.length !== 1) (defaultValues[paths[0]] ??= []).push(prop);
 			}
-			if (prop.isRest) rests.push(prop);
 		}
+		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${importHelperFn(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
 		for (const [path, values] of Object.entries(defaultValues)) {
 			const createPropsDefaultProxy = importHelperFn(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId);
-			const resolvedPath = path.replace(`${HELPER_PREFIX}default_`, HELPER_PREFIX);
 			const resolvedValues = values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ");
-			prependFunctionalNode(node, s, `\nconst ${path} = ${createPropsDefaultProxy}(${resolvedPath}, {${resolvedValues}})`);
+			prependFunctionalNode(node, s, `\n${path} = ${createPropsDefaultProxy}(${path}, {${resolvedValues}})`);
 		}
-		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${importHelperFn(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
 		walkIdentifiers(node.body, (id, parent) => {
 			const prop = propList.find((i) => i.name === id.name);
 			if (prop && !prop.isRest) s.overwrite(id.start, id.end, `${parent?.type === "ObjectProperty" && parent.shorthand ? `${id.name}: ` : ""}${prop.path}${prop.value}`);
@@ -56,7 +51,7 @@ function restructure(s, node, options = {}) {
 	}
 	return propList;
 }
-function getProps(node, path = "", s, props = [], options) {
+function getProps(s, options, node, path = "", props = []) {
 	const properties = node.type === "ObjectPattern" ? node.properties : node.type === "ArrayPattern" ? node.elements : [];
 	if (!properties.length) return;
 	const propNames = [];
@@ -73,22 +68,25 @@ function getProps(node, path = "", s, props = [], options) {
 				path,
 				name: prop.left.name,
 				value: `[${index}]`,
-				defaultValue: s.slice(prop.right.start, prop.right.end)
+				defaultValue: s.sliceNode(getDefaultValue(prop.right))
 			});
 			propNames.push(`'${prop.left.name}'`);
 		} else if (prop?.type === "ObjectProperty" && prop.key.type === "Identifier") {
-			if (prop.value.type === "AssignmentPattern" && prop.value.left.type === "Identifier") props.push({
+			if (prop.value.type === "AssignmentPattern") if (prop.value.left.type === "Identifier") props.push({
 				path,
 				name: prop.value.left.name,
 				value: `.${prop.key.name}`,
-				defaultValue: s.slice(prop.value.right.start, prop.value.right.end),
-				isRequired: prop.value.right.type === "TSNonNullExpression"
-			});
-			else if (!getProps(prop.value, `${path}.${prop.key.name}`, s, props, options)) props.push({
-				path,
-				name: prop.value.type === "Identifier" ? prop.value.name : prop.key.name,
-				value: `.${prop.key.name}`
+				defaultValue: s.sliceNode(getDefaultValue(prop.value.right))
 			});
+			else getProps(s, options, prop.value.left, `${path}.${prop.key.name}`, props);
+			else if (!getProps(s, options, prop.value, `${path}.${prop.key.name}`, props)) {
+				const name = prop.value.type === "Identifier" ? prop.value.name : prop.key.name;
+				props.push({
+					path,
+					name,
+					value: `.${prop.key.name}`
+				});
+			}
 			propNames.push(`'${prop.key.name}'`);
 		} else if (prop?.type === "RestElement" && prop.argument.type === "Identifier" && !prop.argument.name.startsWith(`${HELPER_PREFIX}props`)) props.push({
 			path,
@@ -96,10 +94,15 @@ function getProps(node, path = "", s, props = [], options) {
 			value: propNames.join(", "),
 			isRest: true
 		});
-		else if (prop) getProps(prop, `${path}[${index}]`, s, props, options);
+		else if (prop) getProps(s, options, prop, `${path}[${index}]`, props);
 	});
 	return props.length ? props : void 0;
 }
+function getDefaultValue(node) {
+	if (node.type === "TSNonNullExpression") return getDefaultValue(node.expression);
+	if (node.type === "TSAsExpression") return getDefaultValue(node.expression);
+	return node;
+}
 function prependFunctionalNode(node, s, result) {
 	const isBlockStatement = node.body.type === "BlockStatement";
 	const start = node.body.extra?.parenthesized ? node.body.extra.parenStart : node.body.start;
@@ -164,37 +167,49 @@ function transformDefineComponent(root, propsName, map, s, autoReturnFunction =
 	if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) importHelperFn(s, 0, "defineComponent", defineComponentName);
 	let hasRestProp = false;
 	const props = {};
-	if (root.params[0]) if (root.params[0].type === "Identifier") getWalkedIds(root, propsName).forEach((id) => props[id] = null);
-	else {
-		const restructuredProps = restructure(s, root, { generateRestProps: (restPropsName, index, list) => {
-			if (index === list.length - 1) {
-				hasRestProp = true;
-				const useAttrs = importHelperFn(s, 0, "useAttrs");
-				return `const ${restPropsName} = ${useAttrs}()`;
+	if (root.params[0]) {
+		if (root.params[0].type === "Identifier") getWalkedIds(root, propsName).forEach((id) => props[id] = null);
+		else if (root.params[0].type === "ObjectPattern") {
+			const restructuredProps = root.params[0];
+			for (const prop of restructuredProps.properties) {
+				if (prop.type !== "ObjectProperty" || prop.key.type !== "Identifier") continue;
+				const propName = prop.key.name;
+				if (prop.value.type !== "AssignmentPattern") {
+					props[propName] = null;
+					continue;
+				}
+				const defaultValue = getDefaultValue(prop.value.right);
+				const isRequired = prop.value.right.type === "TSNonNullExpression";
+				const propOptions = [];
+				if (isRequired) propOptions.push("required: true");
+				if (defaultValue) {
+					const { value, type, skipFactory } = getTypeAndValue(s, defaultValue);
+					if (type) propOptions.push(`type: ${type}`);
+					if (value) propOptions.push(`default: ${value}`);
+					if (skipFactory) propOptions.push("skipFactory: true");
+				}
+				if (propOptions.length) props[propName] = `{ ${propOptions.join(", ")} }`;
+				else props[propName] = null;
 			}
-		} });
-		for (const prop of restructuredProps) if (prop.path.endsWith("props") && !prop.isRest) props[prop.name] = prop.isRequired ? "{ required: true }" : null;
-	}
-	for (const { expression, isRequired } of map.defineModel || []) {
-		const modelOptions = expression.arguments[0]?.type === "ObjectExpression" ? expression.arguments[0] : expression.arguments[1]?.type === "ObjectExpression" ? expression.arguments[1] : void 0;
-		const options = {};
-		if (isRequired) options.required = true;
-		for (const prop of modelOptions?.properties || []) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && [
-			"validator",
-			"type",
-			"required"
-		].includes(prop.key.name)) options[prop.key.name] = s.sliceNode(prop.value);
-		const propName = expression.arguments[0]?.type === "StringLiteral" ? expression.arguments[0].value : "modelValue";
-		props[propName] = Object.keys(options).length ? `{ ${Object.entries(options).map(([key, value]) => `${key}: ${value}`).join(", ")} }` : null;
-		props[`onUpdate:${propName}`] = null;
-		props[`${propName === "modelValue" ? "model" : propName}Modifiers`] = null;
+			restructure(s, root, {
+				skipDefaultProps: true,
+				generateRestProps: (restPropsName, index, list) => {
+					if (index === list.length - 1) {
+						hasRestProp = true;
+						const useAttrs = importHelperFn(s, 0, "useAttrs");
+						return `const ${restPropsName} = ${useAttrs}()`;
+					}
+				}
+			});
+		}
 	}
-	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", ");
+	transformDefineModel$1(s, map.defineModel, props);
+	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
 		const argument = map.defineComponent.arguments[1];
-		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: { ${propsString} } }`);
+		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
 		else if (argument.type === "ObjectExpression") {
-			prependObjectExpression(argument, "props", `{ ${propsString} }`, s);
+			prependObjectExpression(argument, "props", `{\n${propsString}\n}`, s);
 			if (hasRestProp) prependObjectExpression(argument, "inheritAttrs", "false", s);
 		}
 	}
@@ -211,9 +226,70 @@ function getWalkedIds(root, propsName) {
 			const prop = parent.property.type === "Identifier" ? parent.property.name : parent.property.type === "StringLiteral" ? parent.property.value : "";
 			if (prop) walkedIds.add(prop);
 		}
-	}, false);
+	});
 	return walkedIds;
 }
+function transformDefineModel$1(s, defineModel, props) {
+	for (const { expression, isRequired } of defineModel || []) {
+		const modelOptions = expression.arguments[0]?.type === "ObjectExpression" ? expression.arguments[0] : expression.arguments[1]?.type === "ObjectExpression" ? expression.arguments[1] : void 0;
+		const options = {};
+		if (isRequired) options.required = true;
+		let defaultValueNode;
+		for (const prop of modelOptions?.properties || []) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && [
+			"validator",
+			"type",
+			"required",
+			"default"
+		].includes(prop.key.name)) {
+			if (prop.key.name === "default") defaultValueNode = prop.value;
+			options[prop.key.name] = s.sliceNode(prop.value);
+		}
+		if (defaultValueNode && !options.type) {
+			const { value, type, skipFactory } = getTypeAndValue(s, defaultValueNode);
+			if (type) options.type = type;
+			if (value) options.default = value;
+			if (skipFactory) options.skipFactory = "true";
+		}
+		const propName = expression.arguments[0]?.type === "StringLiteral" ? expression.arguments[0].value : "modelValue";
+		props[propName] = Object.keys(options).length ? `{ ${Object.entries(options).map(([key, value]) => `${key}: ${value}`).join(", ")} }` : null;
+		props[`onUpdate:${propName}`] = null;
+		props[`${propName === "modelValue" ? "model" : propName}Modifiers`] = null;
+	}
+}
+function getTypeAndValue(s, node) {
+	let value = "";
+	let type = "";
+	let skipFactory = false;
+	if (node.type === "StringLiteral") {
+		type = "String";
+		value = `'${node.value}'`;
+	} else if (node.type === "BooleanLiteral") {
+		type = "Boolean";
+		value = String(node.value);
+	} else if (node.type === "NumericLiteral") {
+		type = "Number";
+		value = String(node.value);
+	} else if (node.type === "ObjectExpression") {
+		type = "Object";
+		value = `() => (${s.sliceNode(node)})`;
+	} else if (node.type === "ArrayExpression") {
+		type = "Array";
+		value = `() => (${s.sliceNode(node)})`;
+	} else if (isFunctionalNode(node)) {
+		type = "Function";
+		value = s.sliceNode(node);
+	} else if (node.type === "Identifier") if (node.name === "undefined") value = "undefined";
+	else {
+		skipFactory = true;
+		value = s.sliceNode(node);
+	}
+	else if (node.type === "NullLiteral") value = "null";
+	return {
+		value,
+		type,
+		skipFactory
+	};
+}
 
 //#endregion
 //#region src/core/define-expose.ts

package/dist/{core-B1Tt-ieP.cjs → core-CdPKEM79.cjs}

@@ -24,33 +24,28 @@ function restructure(s, node, options = {}) {
 	const propList = [];
 	for (const param of node.params) {
 		const path = `${__vue_macros_common.HELPER_PREFIX}props${index++ || ""}`;
-		const props = getProps(param, path, s, [], options);
+		const props = getProps(s, options, param, path);
 		if (props) {
-			const hasDefaultValue = props.some((i) => i.defaultValue);
 			s.overwrite(param.start, param.end, path);
-			propList.push(...hasDefaultValue ? props.map((i) => ({
-				...i,
-				path: i.path.replace(__vue_macros_common.HELPER_PREFIX, `${__vue_macros_common.HELPER_PREFIX}default_`)
-			})) : props);
+			propList.push(...props);
 		}
 	}
 	if (propList.length) {
 		const defaultValues = {};
 		const rests = [];
 		for (const prop of propList) {
+			if (prop.isRest) rests.push(prop);
 			if (prop.defaultValue) {
-				const basePath = prop.path.split(/\.|\[/)[0];
-				(defaultValues[basePath] ??= []).push(prop);
+				const paths = prop.path.split(/\.|\[/);
+				if (!options.skipDefaultProps || paths.length !== 1) (defaultValues[paths[0]] ??= []).push(prop);
 			}
-			if (prop.isRest) rests.push(prop);
 		}
+		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
 		for (const [path, values] of Object.entries(defaultValues)) {
 			const createPropsDefaultProxy = (0, __vue_macros_common.importHelperFn)(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId);
-			const resolvedPath = path.replace(`${__vue_macros_common.HELPER_PREFIX}default_`, __vue_macros_common.HELPER_PREFIX);
 			const resolvedValues = values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ");
-			prependFunctionalNode(node, s, `\nconst ${path} = ${createPropsDefaultProxy}(${resolvedPath}, {${resolvedValues}})`);
+			prependFunctionalNode(node, s, `\n${path} = ${createPropsDefaultProxy}(${path}, {${resolvedValues}})`);
 		}
-		for (const [index$1, rest] of rests.entries()) prependFunctionalNode(node, s, options.generateRestProps?.(rest.name, index$1, rests) ?? `\nconst ${rest.name} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "createPropsRestProxy")}(${rest.path}, [${rest.value}])`);
 		(0, __vue_compiler_sfc.walkIdentifiers)(node.body, (id, parent) => {
 			const prop = propList.find((i) => i.name === id.name);
 			if (prop && !prop.isRest) s.overwrite(id.start, id.end, `${parent?.type === "ObjectProperty" && parent.shorthand ? `${id.name}: ` : ""}${prop.path}${prop.value}`);
@@ -58,7 +53,7 @@ function restructure(s, node, options = {}) {
 	}
 	return propList;
 }
-function getProps(node, path = "", s, props = [], options) {
+function getProps(s, options, node, path = "", props = []) {
 	const properties = node.type === "ObjectPattern" ? node.properties : node.type === "ArrayPattern" ? node.elements : [];
 	if (!properties.length) return;
 	const propNames = [];
@@ -75,22 +70,25 @@ function getProps(node, path = "", s, props = [], options) {
 				path,
 				name: prop.left.name,
 				value: `[${index}]`,
-				defaultValue: s.slice(prop.right.start, prop.right.end)
+				defaultValue: s.sliceNode(getDefaultValue(prop.right))
 			});
 			propNames.push(`'${prop.left.name}'`);
 		} else if (prop?.type === "ObjectProperty" && prop.key.type === "Identifier") {
-			if (prop.value.type === "AssignmentPattern" && prop.value.left.type === "Identifier") props.push({
+			if (prop.value.type === "AssignmentPattern") if (prop.value.left.type === "Identifier") props.push({
 				path,
 				name: prop.value.left.name,
 				value: `.${prop.key.name}`,
-				defaultValue: s.slice(prop.value.right.start, prop.value.right.end),
-				isRequired: prop.value.right.type === "TSNonNullExpression"
-			});
-			else if (!getProps(prop.value, `${path}.${prop.key.name}`, s, props, options)) props.push({
-				path,
-				name: prop.value.type === "Identifier" ? prop.value.name : prop.key.name,
-				value: `.${prop.key.name}`
+				defaultValue: s.sliceNode(getDefaultValue(prop.value.right))
 			});
+			else getProps(s, options, prop.value.left, `${path}.${prop.key.name}`, props);
+			else if (!getProps(s, options, prop.value, `${path}.${prop.key.name}`, props)) {
+				const name = prop.value.type === "Identifier" ? prop.value.name : prop.key.name;
+				props.push({
+					path,
+					name,
+					value: `.${prop.key.name}`
+				});
+			}
 			propNames.push(`'${prop.key.name}'`);
 		} else if (prop?.type === "RestElement" && prop.argument.type === "Identifier" && !prop.argument.name.startsWith(`${__vue_macros_common.HELPER_PREFIX}props`)) props.push({
 			path,
@@ -98,10 +96,15 @@ function getProps(node, path = "", s, props = [], options) {
 			value: propNames.join(", "),
 			isRest: true
 		});
-		else if (prop) getProps(prop, `${path}[${index}]`, s, props, options);
+		else if (prop) getProps(s, options, prop, `${path}[${index}]`, props);
 	});
 	return props.length ? props : void 0;
 }
+function getDefaultValue(node) {
+	if (node.type === "TSNonNullExpression") return getDefaultValue(node.expression);
+	if (node.type === "TSAsExpression") return getDefaultValue(node.expression);
+	return node;
+}
 function prependFunctionalNode(node, s, result) {
 	const isBlockStatement = node.body.type === "BlockStatement";
 	const start = node.body.extra?.parenthesized ? node.body.extra.parenStart : node.body.start;
@@ -166,37 +169,49 @@ function transformDefineComponent(root, propsName, map, s, autoReturnFunction =
 	if (defineComponentName && !["defineComponent", "defineVaporComponent"].includes(defineComponentName)) (0, __vue_macros_common.importHelperFn)(s, 0, "defineComponent", defineComponentName);
 	let hasRestProp = false;
 	const props = {};
-	if (root.params[0]) if (root.params[0].type === "Identifier") getWalkedIds(root, propsName).forEach((id) => props[id] = null);
-	else {
-		const restructuredProps = restructure(s, root, { generateRestProps: (restPropsName, index, list) => {
-			if (index === list.length - 1) {
-				hasRestProp = true;
-				const useAttrs = (0, __vue_macros_common.importHelperFn)(s, 0, "useAttrs");
-				return `const ${restPropsName} = ${useAttrs}()`;
+	if (root.params[0]) {
+		if (root.params[0].type === "Identifier") getWalkedIds(root, propsName).forEach((id) => props[id] = null);
+		else if (root.params[0].type === "ObjectPattern") {
+			const restructuredProps = root.params[0];
+			for (const prop of restructuredProps.properties) {
+				if (prop.type !== "ObjectProperty" || prop.key.type !== "Identifier") continue;
+				const propName = prop.key.name;
+				if (prop.value.type !== "AssignmentPattern") {
+					props[propName] = null;
+					continue;
+				}
+				const defaultValue = getDefaultValue(prop.value.right);
+				const isRequired = prop.value.right.type === "TSNonNullExpression";
+				const propOptions = [];
+				if (isRequired) propOptions.push("required: true");
+				if (defaultValue) {
+					const { value, type, skipFactory } = getTypeAndValue(s, defaultValue);
+					if (type) propOptions.push(`type: ${type}`);
+					if (value) propOptions.push(`default: ${value}`);
+					if (skipFactory) propOptions.push("skipFactory: true");
+				}
+				if (propOptions.length) props[propName] = `{ ${propOptions.join(", ")} }`;
+				else props[propName] = null;
 			}
-		} });
-		for (const prop of restructuredProps) if (prop.path.endsWith("props") && !prop.isRest) props[prop.name] = prop.isRequired ? "{ required: true }" : null;
-	}
-	for (const { expression, isRequired } of map.defineModel || []) {
-		const modelOptions = expression.arguments[0]?.type === "ObjectExpression" ? expression.arguments[0] : expression.arguments[1]?.type === "ObjectExpression" ? expression.arguments[1] : void 0;
-		const options = {};
-		if (isRequired) options.required = true;
-		for (const prop of modelOptions?.properties || []) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && [
-			"validator",
-			"type",
-			"required"
-		].includes(prop.key.name)) options[prop.key.name] = s.sliceNode(prop.value);
-		const propName = expression.arguments[0]?.type === "StringLiteral" ? expression.arguments[0].value : "modelValue";
-		props[propName] = Object.keys(options).length ? `{ ${Object.entries(options).map(([key, value]) => `${key}: ${value}`).join(", ")} }` : null;
-		props[`onUpdate:${propName}`] = null;
-		props[`${propName === "modelValue" ? "model" : propName}Modifiers`] = null;
+			restructure(s, root, {
+				skipDefaultProps: true,
+				generateRestProps: (restPropsName, index, list) => {
+					if (index === list.length - 1) {
+						hasRestProp = true;
+						const useAttrs = (0, __vue_macros_common.importHelperFn)(s, 0, "useAttrs");
+						return `const ${restPropsName} = ${useAttrs}()`;
+					}
+				}
+			});
+		}
 	}
-	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", ");
+	transformDefineModel$1(s, map.defineModel, props);
+	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
 	if (propsString) {
 		const argument = map.defineComponent.arguments[1];
-		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: { ${propsString} } }`);
+		if (!argument) s.appendRight(root.end, `, {${hasRestProp ? "inheritAttrs: false," : ""} props: {\n${propsString}\n} }`);
 		else if (argument.type === "ObjectExpression") {
-			prependObjectExpression(argument, "props", `{ ${propsString} }`, s);
+			prependObjectExpression(argument, "props", `{\n${propsString}\n}`, s);
 			if (hasRestProp) prependObjectExpression(argument, "inheritAttrs", "false", s);
 		}
 	}
@@ -213,9 +228,70 @@ function getWalkedIds(root, propsName) {
 			const prop = parent.property.type === "Identifier" ? parent.property.name : parent.property.type === "StringLiteral" ? parent.property.value : "";
 			if (prop) walkedIds.add(prop);
 		}
-	}, false);
+	});
 	return walkedIds;
 }
+function transformDefineModel$1(s, defineModel, props) {
+	for (const { expression, isRequired } of defineModel || []) {
+		const modelOptions = expression.arguments[0]?.type === "ObjectExpression" ? expression.arguments[0] : expression.arguments[1]?.type === "ObjectExpression" ? expression.arguments[1] : void 0;
+		const options = {};
+		if (isRequired) options.required = true;
+		let defaultValueNode;
+		for (const prop of modelOptions?.properties || []) if (prop.type === "ObjectProperty" && prop.key.type === "Identifier" && [
+			"validator",
+			"type",
+			"required",
+			"default"
+		].includes(prop.key.name)) {
+			if (prop.key.name === "default") defaultValueNode = prop.value;
+			options[prop.key.name] = s.sliceNode(prop.value);
+		}
+		if (defaultValueNode && !options.type) {
+			const { value, type, skipFactory } = getTypeAndValue(s, defaultValueNode);
+			if (type) options.type = type;
+			if (value) options.default = value;
+			if (skipFactory) options.skipFactory = "true";
+		}
+		const propName = expression.arguments[0]?.type === "StringLiteral" ? expression.arguments[0].value : "modelValue";
+		props[propName] = Object.keys(options).length ? `{ ${Object.entries(options).map(([key, value]) => `${key}: ${value}`).join(", ")} }` : null;
+		props[`onUpdate:${propName}`] = null;
+		props[`${propName === "modelValue" ? "model" : propName}Modifiers`] = null;
+	}
+}
+function getTypeAndValue(s, node) {
+	let value = "";
+	let type = "";
+	let skipFactory = false;
+	if (node.type === "StringLiteral") {
+		type = "String";
+		value = `'${node.value}'`;
+	} else if (node.type === "BooleanLiteral") {
+		type = "Boolean";
+		value = String(node.value);
+	} else if (node.type === "NumericLiteral") {
+		type = "Number";
+		value = String(node.value);
+	} else if (node.type === "ObjectExpression") {
+		type = "Object";
+		value = `() => (${s.sliceNode(node)})`;
+	} else if (node.type === "ArrayExpression") {
+		type = "Array";
+		value = `() => (${s.sliceNode(node)})`;
+	} else if (isFunctionalNode(node)) {
+		type = "Function";
+		value = s.sliceNode(node);
+	} else if (node.type === "Identifier") if (node.name === "undefined") value = "undefined";
+	else {
+		skipFactory = true;
+		value = s.sliceNode(node);
+	}
+	else if (node.type === "NullLiteral") value = "null";
+	return {
+		value,
+		type,
+		skipFactory
+	};
+}
 
 //#endregion
 //#region src/core/define-expose.ts

package/dist/esbuild.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import { src_default } from "./src-BfZoaRPY.js";
+import { src_default } from "./src-CjDaDFw_.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 const require_options = require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 exports.default = require_src.src_default
 exports.resolveOptions = require_options.resolveOptions

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import { resolveOptions } from "./options-pbSvpKdV.js";
-import { src_default } from "./src-BfZoaRPY.js";
+import { src_default } from "./src-CjDaDFw_.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-require('./src-DwQLomPw.cjs');
-const require_vite = require('./vite-C5QxH0B9.cjs');
-const require_webpack = require('./webpack-B-EPKx0G.cjs');
+require('./src-CY9FOMwg.cjs');
+const require_vite = require('./vite-CtRiheet.cjs');
+const require_webpack = require('./webpack-YO7qm0E9.cjs');
 const __nuxt_kit = require_chunk.__toESM(require("@nuxt/kit"));
 require("@nuxt/schema");
 

package/dist/nuxt.js

@@ -1,9 +1,9 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import "./src-BfZoaRPY.js";
-import { vite_default } from "./vite-DPLCEtsm.js";
-import { webpack_default } from "./webpack-1cYmRdvx.js";
+import "./src-CjDaDFw_.js";
+import { vite_default } from "./vite-HbXTfQl_.js";
+import { webpack_default } from "./webpack-5inEmXrh.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";
 import "@nuxt/schema";
 

package/dist/{raw-9SXDNxBH.js → raw-9H5vTeLe.js}

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

package/dist/{raw-3ZelnSQR.cjs → raw-oJpqvj1N.cjs}

@@ -1,6 +1,6 @@
 "use strict";
 const require_chunk = require('./chunk-BCwAaXi7.cjs');
-const require_core = require('./core-B1Tt-ieP.cjs');
+const require_core = require('./core-CdPKEM79.cjs');
 const require_options = require('./options-CNIhAQHD.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.cjs

@@ -1,6 +1,6 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-B1Tt-ieP.cjs');
-const require_raw = require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+const require_raw = require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
 
 exports.default = require_raw.raw_default

package/dist/raw.js

@@ -1,5 +1,5 @@
-import "./core-cHgZBgtA.js";
-import { raw_default } from "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import { raw_default } from "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
 
 export { raw_default as default };

package/dist/rolldown.cjs

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import { src_default } from "./src-BfZoaRPY.js";
+import { src_default } from "./src-CjDaDFw_.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import { src_default } from "./src-BfZoaRPY.js";
+import { src_default } from "./src-CjDaDFw_.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

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

package/dist/{src-DwQLomPw.cjs → src-CY9FOMwg.cjs}

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

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

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

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

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

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

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

package/dist/vite.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-require('./src-DwQLomPw.cjs');
-const require_vite = require('./vite-C5QxH0B9.cjs');
+require('./src-CY9FOMwg.cjs');
+const require_vite = require('./vite-CtRiheet.cjs');
 
 exports.default = require_vite.vite_default

package/dist/vite.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import "./src-BfZoaRPY.js";
-import { vite_default } from "./vite-DPLCEtsm.js";
+import "./src-CjDaDFw_.js";
+import { vite_default } from "./vite-HbXTfQl_.js";
 
 export { vite_default as default };

package/dist/{webpack-1cYmRdvx.js → webpack-5inEmXrh.js}

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

package/dist/{webpack-B-EPKx0G.cjs → webpack-YO7qm0E9.cjs}

@@ -1,5 +1,5 @@
 "use strict";
-const require_src = require('./src-DwQLomPw.cjs');
+const require_src = require('./src-CY9FOMwg.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-B1Tt-ieP.cjs');
-require('./raw-3ZelnSQR.cjs');
+require('./core-CdPKEM79.cjs');
+require('./raw-oJpqvj1N.cjs');
 require('./options-CNIhAQHD.cjs');
-require('./src-DwQLomPw.cjs');
-const require_webpack = require('./webpack-B-EPKx0G.cjs');
+require('./src-CY9FOMwg.cjs');
+const require_webpack = require('./webpack-YO7qm0E9.cjs');
 
 exports.default = require_webpack.webpack_default

package/dist/webpack.js

@@ -1,7 +1,7 @@
-import "./core-cHgZBgtA.js";
-import "./raw-9SXDNxBH.js";
+import "./core-B_EM_kTA.js";
+import "./raw-9H5vTeLe.js";
 import "./options-pbSvpKdV.js";
-import "./src-BfZoaRPY.js";
-import { webpack_default } from "./webpack-1cYmRdvx.js";
+import "./src-CjDaDFw_.js";
+import { webpack_default } from "./webpack-5inEmXrh.js";
 
 export { webpack_default as default };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue-jsx-vapor/macros",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "description": "Macros for Vue JSX Vapor",
   "type": "module",
   "keywords": [