@vue-jsx-vapor/macros 3.0.4 → 3.1.1

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-DI7PhQUs.cjs');
+const require_core = require('./core-D-A12ijt.cjs');
 
 exports.getMacroExpression = require_core.getMacroExpression;
 exports.isFunctionalNode = require_core.isFunctionalNode;

package/dist/api.d.cts

@@ -1,4 +1,4 @@
-import { n as OptionsResolved } from "./options-BuPPJCpP.cjs";
+import { n as OptionsResolved } from "./options-GMWSYHT2.cjs";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node, VoidPattern } from "@babel/types";
 

package/dist/api.d.ts

@@ -1,4 +1,4 @@
-import { n as OptionsResolved } from "./options-58c0LE2P.js";
+import { n as OptionsResolved } from "./options-DQnbL7dH.js";
 import { CodeTransform, MagicStringAST } from "@vue-macros/common";
 import { ArrowFunctionExpression, CallExpression, FunctionDeclaration, FunctionExpression, LVal, Node, VoidPattern } from "@babel/types";
 

package/dist/api.js

@@ -1,3 +1,3 @@
-import { i as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-BjuLGmtM.js";
+import { i as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-BVfDFJ0y.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-DI7PhQUs.cjs');
-require('./raw-BBO_BQmg.cjs');
-require('./options-CQy8quq_.cjs');
-const require_src = require('./src-BCG8IRsQ.cjs');
+require('./core-D-A12ijt.cjs');
+require('./raw-9Uamse-H.cjs');
+require('./options-nk0sI1tl.cjs');
+const require_src = require('./src-a8io3VxL.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.d.cts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-BuPPJCpP.cjs";
+import { t as Options } from "./options-GMWSYHT2.cjs";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {

package/dist/astro.d.ts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-58c0LE2P.js";
+import { t as Options } from "./options-DQnbL7dH.js";
 
 //#region src/astro.d.ts
 declare const _default: (options: Options) => {

package/dist/astro.js

@@ -1,7 +1,7 @@
-import "./core-BjuLGmtM.js";
-import "./raw-CSj3YtCv.js";
-import "./options-BjmC0ExR.js";
-import { t as src_default } from "./src-BhIWqP4c.js";
+import "./core-BVfDFJ0y.js";
+import "./raw-P3NIxBoI.js";
+import "./options-kv1xT1jX.js";
+import { t as src_default } from "./src-DZKWkIh7.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/{core-BjuLGmtM.js → core-BVfDFJ0y.js}

@@ -6,7 +6,7 @@ var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nco
 
 //#endregion
 //#region src/core/helper/with-defaults.ts?raw
-var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
+var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of /* @__PURE__ */ new Set([\n    ...Object.keys(props),\n    ...Object.keys(defaultProps)\n  ])) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
 
 //#endregion
 //#region src/core/helper/index.ts
@@ -19,7 +19,7 @@ const withDefaultsHelperId = `${helperPrefix}/with-defaults`;
 function prependFunctionalNode(node, s, result) {
 	const isBlockStatement = node.body.type === "BlockStatement";
 	const start = node.body.extra?.parenthesized ? node.body.extra.parenStart : node.body.start;
-	s.appendRight(start + (isBlockStatement ? 1 : 0), `${result};${!isBlockStatement ? "return " : ""}`);
+	s.appendRight(start + (isBlockStatement ? 1 : 0), `${result};${isBlockStatement ? "" : "return "}`);
 	if (!isBlockStatement) {
 		s.appendLeft(start, "{");
 		s.appendRight(node.end, "}");
@@ -169,7 +169,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 	if (root.params[0]) {
 		if (root.params[0].type === "Identifier") {
 			getWalkedIds(root, propsName).forEach((id) => props[id] = null);
-			prependFunctionalNode(root, s, `const ${propsName} = ${importHelperFn(s, 0, "useFullProps", void 0, "vue-jsx-vapor")}()`);
+			prependFunctionalNode(root, s, `const ${propsName} = ${importHelperFn(s, 0, "useFullProps", void 0, "/vue-jsx-vapor/props")}()`);
 			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `${HELPER_PREFIX}props` : root.start === root.params[0].start ? "()" : "");
 		} else if (root.params[0].type === "ObjectPattern") {
 			const restructuredProps = root.params[0];
@@ -265,30 +265,37 @@ 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);
+	switch (node.type) {
+		case "StringLiteral":
+			type = "String";
+			value = `'${node.value}'`;
+			break;
+		case "BooleanLiteral":
+			type = "Boolean";
+			value = String(node.value);
+			break;
+		case "NumericLiteral":
+			type = "Number";
+			value = String(node.value);
+			break;
+		case "ObjectExpression":
+			type = "Object";
+			value = `() => (${s.sliceNode(node)})`;
+			break;
+		case "ArrayExpression":
+			type = "Array";
+			value = `() => (${s.sliceNode(node)})`;
+			break;
+		default: 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";
 	}
-	else if (node.type === "NullLiteral") value = "null";
 	return {
 		value,
 		type,
@@ -300,14 +307,14 @@ function getTypeAndValue(s, node) {
 //#region src/core/define-expose.ts
 function transformDefineExpose(node, s) {
 	s.overwriteNode(node.callee, ";");
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${importHelperFn(s, 0, "getCurrentInstance", void 0, "vue-jsx-vapor")}().exposed = `);
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${importHelperFn(s, 0, "getCurrentInstance", void 0, "/vue-jsx-vapor/props")}().exposed = `);
 }
 
 //#endregion
 //#region src/core/define-model.ts
 function transformDefineModel(node, propsName, s) {
 	s.overwriteNode(node.callee, importHelperFn(s, 0, "useModel", void 0, useModelHelperId));
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${propsName}, ${node.arguments[0]?.type !== "StringLiteral" ? `'modelValue',` : ""}`);
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${propsName}, ${node.arguments[0]?.type === "StringLiteral" ? "" : `'modelValue',`}`);
 }
 
 //#endregion

package/dist/{core-DI7PhQUs.cjs → core-D-A12ijt.cjs}

@@ -1,15 +1,40 @@
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-let __vue_macros_common = require("@vue-macros/common");
-__vue_macros_common = require_chunk.__toESM(__vue_macros_common);
+//#region rolldown:runtime
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __copyProps = (to, from, except, desc) => {
+	if (from && typeof from === "object" || typeof from === "function") {
+		for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
+			key = keys[i];
+			if (!__hasOwnProp.call(to, key) && key !== except) {
+				__defProp(to, key, {
+					get: ((k) => from[k]).bind(null, key),
+					enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
+				});
+			}
+		}
+	}
+	return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", {
+	value: mod,
+	enumerable: true
+}) : target, mod));
+
+//#endregion
+let _vue_macros_common = require("@vue-macros/common");
 let hash_sum = require("hash-sum");
-hash_sum = require_chunk.__toESM(hash_sum);
+hash_sum = __toESM(hash_sum);
 
 //#region src/core/helper/use-model.ts?raw
 var use_model_default = "import { customRef, watchSyncEffect } from \"vue\";\nconst EMPTY_OBJ = {};\nexport function useModel(props, name, options = {}) {\n  const res = customRef((track, trigger) => {\n    let localValue = options && options.default;\n    let prevSetValue = EMPTY_OBJ;\n    watchSyncEffect(() => {\n      let propValue = props[name];\n      if (propValue === void 0) {\n        propValue = options && options.default;\n      }\n      if (!Object.is(localValue, propValue)) {\n        localValue = propValue;\n        trigger();\n      }\n    });\n    return {\n      get() {\n        track();\n        return options.get ? options.get(localValue) : localValue;\n      },\n      set(value) {\n        const emittedValue = options.set ? options.set(value) : value;\n        if (Object.is(emittedValue, localValue) && (prevSetValue === EMPTY_OBJ || Object.is(value, prevSetValue)))\n          return;\n        localValue = emittedValue;\n        trigger();\n        for (const emit of [props[`onUpdate:${name}`]].flat()) {\n          if (typeof emit === \"function\") emit(emittedValue);\n        }\n        prevSetValue = value;\n      }\n    };\n  });\n  res[Symbol.iterator] = () => {\n    let i = 0;\n    return {\n      next() {\n        if (i < 2) {\n          return {\n            value: i++ ? props[`${name}Modifiers`] || {} : res,\n            done: false\n          };\n        } else {\n          return { done: true };\n        }\n      }\n    };\n  };\n  return res;\n}\n";
 
 //#endregion
 //#region src/core/helper/with-defaults.ts?raw
-var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of [\n    .../* @__PURE__ */ new Set([...Object.keys(props), ...Object.keys(defaultProps)])\n  ]) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
+var with_defaults_default = "function resolveDefaultProps(paths) {\n  const result = {};\n  for (const path of Object.keys(paths)) {\n    const segments = path.split(/[.?[\\]]/).filter(Boolean);\n    let current = result;\n    for (let i = 0; i < segments.length; i++) {\n      const segment = segments[i];\n      if (i === segments.length - 1) {\n        current[segment] = paths[path];\n      } else {\n        if (!current[segment]) {\n          current[segment] = Number.isNaN(Number(segments[i + 1])) ? {} : [];\n        }\n        current = current[segment];\n      }\n    }\n  }\n  return result;\n}\nexport function createPropsDefaultProxy(props, defaults) {\n  const defaultProps = resolveDefaultProps(defaults);\n  const result = {};\n  for (const key of /* @__PURE__ */ new Set([\n    ...Object.keys(props),\n    ...Object.keys(defaultProps)\n  ])) {\n    Object.defineProperty(result, key, {\n      enumerable: true,\n      get: () => props[key] === void 0 ? defaultProps[key] : props[key]\n    });\n  }\n  return result;\n}\n";
 
 //#endregion
 //#region src/core/helper/index.ts
@@ -22,7 +47,7 @@ const withDefaultsHelperId = `${helperPrefix}/with-defaults`;
 function prependFunctionalNode(node, s, result) {
 	const isBlockStatement = node.body.type === "BlockStatement";
 	const start = node.body.extra?.parenthesized ? node.body.extra.parenStart : node.body.start;
-	s.appendRight(start + (isBlockStatement ? 1 : 0), `${result};${!isBlockStatement ? "return " : ""}`);
+	s.appendRight(start + (isBlockStatement ? 1 : 0), `${result};${isBlockStatement ? "" : "return "}`);
 	if (!isBlockStatement) {
 		s.appendLeft(start, "{");
 		s.appendRight(node.end, "}");
@@ -46,7 +71,7 @@ function restructure(s, node, options = {}) {
 	let index = 0;
 	const propList = [];
 	for (const param of node.params) {
-		const path = `${__vue_macros_common.HELPER_PREFIX}props${index++ || ""}`;
+		const path = `${_vue_macros_common.HELPER_PREFIX}props${index++ || ""}`;
 		const props = getProps(s, options, param, path);
 		if (props) {
 			s.overwrite(param.start, param.end, path);
@@ -63,9 +88,9 @@ function restructure(s, node, options = {}) {
 				if (!options.skipDefaultProps || paths.length !== 1) (defaultValues[paths[0]] ??= []).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)) prependFunctionalNode(node, s, `\n${path} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId)}(${path}, {${values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ")}})`);
-		(0, __vue_macros_common.walkIdentifiers)(node.body, (id, parent) => {
+		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)) prependFunctionalNode(node, s, `\n${path} = ${(0, _vue_macros_common.importHelperFn)(s, 0, "createPropsDefaultProxy", void 0, options.withDefaultsFrom ?? withDefaultsHelperId)}(${path}, {${values.map((i) => `'${i.path.replace(path, "")}${i.value}': ${i.defaultValue}`).join(", ")}})`);
+		(0, _vue_macros_common.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}`);
 		}, false);
@@ -109,7 +134,7 @@ function getProps(s, options, node, path = "", props = []) {
 				});
 			}
 			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({
+		} else if (prop?.type === "RestElement" && prop.argument.type === "Identifier" && !prop.argument.name.startsWith(`${_vue_macros_common.HELPER_PREFIX}props`)) props.push({
 			path,
 			name: prop.argument.name,
 			value: propNames.join(", "),
@@ -127,9 +152,9 @@ function transformAwait(root, s) {
 	let hasAwait = false;
 	for (const node of root.body.body) if (node.type === "VariableDeclaration" && !node.declare || node.type.endsWith("Statement")) {
 		const scope = [root.body.body];
-		(0, __vue_macros_common.walkAST)(node, {
+		(0, _vue_macros_common.walkAST)(node, {
 			enter(child, parent) {
-				if ((0, __vue_macros_common.isFunctionType)(child)) this.skip();
+				if ((0, _vue_macros_common.isFunctionType)(child)) this.skip();
 				if (child.type === "BlockStatement") scope.push(child.body);
 				if (child.type === "AwaitExpression") {
 					hasAwait = true;
@@ -149,7 +174,7 @@ function processAwait(s, node, needSemi, isStatement) {
 	const argumentStart = node.argument.extra && node.argument.extra.parenthesized ? node.argument.extra.parenStart : node.argument.start;
 	const argumentStr = s.slice(argumentStart, node.argument.end);
 	const containsNestedAwait = /\bawait\b/.test(argumentStr);
-	s.overwrite(node.start, argumentStart, `${needSemi ? `;` : ``}(\n  ([__temp,__restore] = ${(0, __vue_macros_common.importHelperFn)(s, 0, `withAsyncContext`)}(${containsNestedAwait ? `async ` : ``}() => `);
+	s.overwrite(node.start, argumentStart, `${needSemi ? `;` : ``}(\n  ([__temp,__restore] = ${(0, _vue_macros_common.importHelperFn)(s, 0, `withAsyncContext`)}(${containsNestedAwait ? `async ` : ``}() => `);
 	s.appendLeft(node.end, `)),\n  ${isStatement ? `` : `__temp = `}await __temp,\n  __restore()${isStatement ? `` : `,\n  __temp`}\n)`);
 }
 
@@ -166,14 +191,14 @@ function transformReturn(root, s) {
 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);
+	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);
-			prependFunctionalNode(root, s, `const ${propsName} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "useFullProps", void 0, "vue-jsx-vapor")}()`);
-			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `${__vue_macros_common.HELPER_PREFIX}props` : root.start === root.params[0].start ? "()" : "");
+			prependFunctionalNode(root, s, `const ${propsName} = ${(0, _vue_macros_common.importHelperFn)(s, 0, "useFullProps", void 0, "/vue-jsx-vapor/props")}()`);
+			s.overwrite(root.params[0].start, root.params[0].end, root.params.length > 1 ? `${_vue_macros_common.HELPER_PREFIX}props` : root.start === root.params[0].start ? "()" : "");
 		} else if (root.params[0].type === "ObjectPattern") {
 			const restructuredProps = root.params[0];
 			for (const prop of restructuredProps.properties) {
@@ -185,7 +210,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 				}
 				const defaultValue = getDefaultValue(prop.value.right);
 				let isRequired = false;
-				(0, __vue_macros_common.walkAST)(prop.value.right, { enter(node) {
+				(0, _vue_macros_common.walkAST)(prop.value.right, { enter(node) {
 					if (node.type === "TSNonNullExpression") {
 						isRequired = true;
 						this.skip();
@@ -207,7 +232,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 				generateRestProps: (restPropsName, index, list) => {
 					if (index === list.length - 1) {
 						hasRestProp = true;
-						return `const ${restPropsName} = ${(0, __vue_macros_common.importHelperFn)(s, 0, "useAttrs")}()`;
+						return `const ${restPropsName} = ${(0, _vue_macros_common.importHelperFn)(s, 0, "useAttrs")}()`;
 					}
 				}
 			});
@@ -229,7 +254,7 @@ function transformDefineComponent(root, propsName, macros, s, autoReturnFunction
 }
 function getWalkedIds(root, propsName) {
 	const walkedIds = /* @__PURE__ */ new Set();
-	(0, __vue_macros_common.walkIdentifiers)(root.body, (id, parent) => {
+	(0, _vue_macros_common.walkIdentifiers)(root.body, (id, parent) => {
 		if (id.name === propsName && (parent?.type === "MemberExpression" || parent?.type === "JSXMemberExpression" || parent?.type === "OptionalMemberExpression")) {
 			const prop = parent.property.type === "Identifier" || parent.property.type === "JSXIdentifier" ? parent.property.name : parent.property.type === "StringLiteral" ? parent.property.value : "";
 			if (prop) walkedIds.add(prop);
@@ -268,30 +293,37 @@ 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);
+	switch (node.type) {
+		case "StringLiteral":
+			type = "String";
+			value = `'${node.value}'`;
+			break;
+		case "BooleanLiteral":
+			type = "Boolean";
+			value = String(node.value);
+			break;
+		case "NumericLiteral":
+			type = "Number";
+			value = String(node.value);
+			break;
+		case "ObjectExpression":
+			type = "Object";
+			value = `() => (${s.sliceNode(node)})`;
+			break;
+		case "ArrayExpression":
+			type = "Array";
+			value = `() => (${s.sliceNode(node)})`;
+			break;
+		default: 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";
 	}
-	else if (node.type === "NullLiteral") value = "null";
 	return {
 		value,
 		type,
@@ -303,21 +335,21 @@ function getTypeAndValue(s, node) {
 //#region src/core/define-expose.ts
 function transformDefineExpose(node, s) {
 	s.overwriteNode(node.callee, ";");
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${(0, __vue_macros_common.importHelperFn)(s, 0, "getCurrentInstance", void 0, "vue-jsx-vapor")}().exposed = `);
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${(0, _vue_macros_common.importHelperFn)(s, 0, "getCurrentInstance", void 0, "/vue-jsx-vapor/props")}().exposed = `);
 }
 
 //#endregion
 //#region src/core/define-model.ts
 function transformDefineModel(node, propsName, s) {
-	s.overwriteNode(node.callee, (0, __vue_macros_common.importHelperFn)(s, 0, "useModel", void 0, useModelHelperId));
-	s.appendRight(node.arguments[0]?.start || node.end - 1, `${propsName}, ${node.arguments[0]?.type !== "StringLiteral" ? `'modelValue',` : ""}`);
+	s.overwriteNode(node.callee, (0, _vue_macros_common.importHelperFn)(s, 0, "useModel", void 0, useModelHelperId));
+	s.appendRight(node.arguments[0]?.start || node.end - 1, `${propsName}, ${node.arguments[0]?.type === "StringLiteral" ? "" : `'modelValue',`}`);
 }
 
 //#endregion
 //#region src/core/define-slots.ts
 function transformDefineSlots(node, s) {
 	s.overwrite(node.start, node.arguments[0]?.start && node.arguments[0].start - 1 || node.typeArguments?.end || node.callee.end, `Object.assign`);
-	const slots = `${(0, __vue_macros_common.importHelperFn)(s, 0, "useSlots")}()`;
+	const slots = `${(0, _vue_macros_common.importHelperFn)(s, 0, "useSlots")}()`;
 	s.appendLeft(node.end - 1, `${node.arguments[0] ? "," : "{}, "}${slots}`);
 }
 
@@ -348,7 +380,7 @@ function transformDefineStyle(defineStyle, index, root, s, importMap, { defineSl
 	}
 	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) {
+		(0, _vue_macros_common.walkAST)(root, { enter(node) {
 			if (node.type === "JSXElement" && s.sliceNode(node.openingElement.name) !== "template") {
 				let subfix = "";
 				if (slotNames.length) {
@@ -380,23 +412,23 @@ function toCssVarId(name, prefix = "") {
 //#endregion
 //#region src/core/index.ts
 function transformJsxMacros(code, id, importMap, options) {
-	const s = new __vue_macros_common.MagicStringAST(code);
-	const lang = (0, __vue_macros_common.getLang)(id);
+	const s = new _vue_macros_common.MagicStringAST(code);
+	const lang = (0, _vue_macros_common.getLang)(id);
 	if (lang === "dts") return;
-	const rootMap = getRootMap((0, __vue_macros_common.babelParse)(s.original, lang), s, options);
+	const rootMap = getRootMap((0, _vue_macros_common.babelParse)(s.original, lang), s, options);
 	let defineStyleIndex = 0;
 	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`;
+		let propsName = `${_vue_macros_common.HELPER_PREFIX}props`;
 		if (root.params[0]) {
 			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 (!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(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 if (macros.defineModel?.length) s.appendRight(getParamsStart(root, s.original), propsName);
 		if (macros.defineComponent) transformDefineComponent(root, propsName, macros, s, options.defineComponent?.autoReturnFunction);
@@ -406,12 +438,12 @@ function transformJsxMacros(code, id, importMap, options) {
 		if (macros.defineSlots) transformDefineSlots(macros.defineSlots.expression, s);
 		if (macros.defineExpose) transformDefineExpose(macros.defineExpose, s);
 	}
-	return (0, __vue_macros_common.generateTransform)(s, id);
+	return (0, _vue_macros_common.generateTransform)(s, id);
 }
 function getRootMap(ast, s, options) {
 	const parents = [];
 	const rootMap = /* @__PURE__ */ new Map();
-	(0, __vue_macros_common.walkAST)(ast, {
+	(0, _vue_macros_common.walkAST)(ast, {
 		enter(node, parent) {
 			parents.unshift(parent);
 			const root = isFunctionalNode(parents[1]) ? parents[1] : void 0;
@@ -465,6 +497,12 @@ function getMacroExpression(node, options) {
 }
 
 //#endregion
+Object.defineProperty(exports, '__toESM', {
+  enumerable: true,
+  get: function () {
+    return __toESM;
+  }
+});
 Object.defineProperty(exports, 'getMacroExpression', {
   enumerable: true,
   get: function () {

package/dist/esbuild.cjs

@@ -1,8 +1,8 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-DI7PhQUs.cjs');
-require('./raw-BBO_BQmg.cjs');
-require('./options-CQy8quq_.cjs');
-const require_src = require('./src-BCG8IRsQ.cjs');
+require('./core-D-A12ijt.cjs');
+require('./raw-9Uamse-H.cjs');
+require('./options-nk0sI1tl.cjs');
+const require_src = require('./src-a8io3VxL.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.d.cts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-BuPPJCpP.cjs";
+import { t as Options } from "./options-GMWSYHT2.cjs";
 import * as esbuild0 from "esbuild";
 
 //#region src/esbuild.d.ts

package/dist/esbuild.d.ts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-58c0LE2P.js";
+import { t as Options } from "./options-DQnbL7dH.js";
 import * as esbuild0 from "esbuild";
 
 //#region src/esbuild.d.ts

package/dist/esbuild.js

@@ -1,7 +1,7 @@
-import "./core-BjuLGmtM.js";
-import "./raw-CSj3YtCv.js";
-import "./options-BjmC0ExR.js";
-import { t as src_default } from "./src-BhIWqP4c.js";
+import "./core-BVfDFJ0y.js";
+import "./raw-P3NIxBoI.js";
+import "./options-kv1xT1jX.js";
+import { t as src_default } from "./src-DZKWkIh7.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-DI7PhQUs.cjs');
-require('./raw-BBO_BQmg.cjs');
-const require_options = require('./options-CQy8quq_.cjs');
-const require_src = require('./src-BCG8IRsQ.cjs');
+require('./core-D-A12ijt.cjs');
+require('./raw-9Uamse-H.cjs');
+const require_options = require('./options-nk0sI1tl.cjs');
+const require_src = require('./src-a8io3VxL.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-BuPPJCpP.cjs";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-GMWSYHT2.cjs";
 import { UnpluginInstance } from "unplugin";
 
 //#region src/index.d.ts

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-58c0LE2P.js";
+import { n as OptionsResolved, r as resolveOptions, t as Options } from "./options-DQnbL7dH.js";
 import { UnpluginInstance } from "unplugin";
 
 //#region src/index.d.ts

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-BjuLGmtM.js";
-import "./raw-CSj3YtCv.js";
-import { t as resolveOptions } from "./options-BjmC0ExR.js";
-import { t as src_default } from "./src-BhIWqP4c.js";
+import "./core-BVfDFJ0y.js";
+import "./raw-P3NIxBoI.js";
+import { t as resolveOptions } from "./options-kv1xT1jX.js";
+import { t as src_default } from "./src-DZKWkIh7.js";
 
 export { src_default as default, resolveOptions };

package/dist/nuxt.cjs

@@ -1,24 +1,22 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-const require_chunk = require('./chunk-CUT6urMc.cjs');
-require('./core-DI7PhQUs.cjs');
-require('./raw-BBO_BQmg.cjs');
-require('./options-CQy8quq_.cjs');
-require('./src-BCG8IRsQ.cjs');
-const require_vite = require('./vite-6TwpceHf.cjs');
-const require_webpack = require('./webpack-nxGFB4Vm.cjs');
-let __nuxt_kit = require("@nuxt/kit");
-__nuxt_kit = require_chunk.__toESM(__nuxt_kit);
+const require_core = require('./core-D-A12ijt.cjs');
+require('./raw-9Uamse-H.cjs');
+require('./options-nk0sI1tl.cjs');
+require('./src-a8io3VxL.cjs');
+const require_vite = require('./vite.cjs');
+const require_webpack = require('./webpack.cjs');
+let _nuxt_kit = require("@nuxt/kit");
 require("@nuxt/schema");
 
 //#region src/nuxt.ts
-var nuxt_default = (0, __nuxt_kit.defineNuxtModule)({
+var nuxt_default = (0, _nuxt_kit.defineNuxtModule)({
 	meta: {
 		name: "nuxt-vue-jsx-vapor",
 		configKey: "unpluginStarter"
 	},
 	setup(options) {
-		(0, __nuxt_kit.addVitePlugin)(() => require_vite.vite_default(options));
-		(0, __nuxt_kit.addWebpackPlugin)(() => require_webpack.webpack_default(options));
+		(0, _nuxt_kit.addVitePlugin)(() => require_vite.default(options));
+		(0, _nuxt_kit.addWebpackPlugin)(() => require_webpack.default(options));
 	}
 });
 

package/dist/nuxt.d.cts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-BuPPJCpP.cjs";
+import { t as Options } from "./options-GMWSYHT2.cjs";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts

package/dist/nuxt.d.ts

@@ -1,4 +1,4 @@
-import { t as Options } from "./options-58c0LE2P.js";
+import { t as Options } from "./options-DQnbL7dH.js";
 import * as _nuxt_schema0 from "@nuxt/schema";
 
 //#region src/nuxt.d.ts