@vue-jsx-vapor/macros 3.2.2 → 3.2.4

package/dist/api.cjs

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

package/dist/api.js

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

package/dist/astro.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/astro.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/astro.ts
 var astro_default = (options) => ({

package/dist/bun.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/bun.ts
 var bun_default = require_src.src_default.bun;

package/dist/bun.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/bun.ts
 var bun_default = src_default.bun;

package/dist/{core-C1igaRmI.js → core-D8gdgBYJ.js}

@@ -674,14 +674,13 @@ function transformDefineComponent(root, propsName, macros, s) {
 	}
 	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
-	if (propsString) {
-		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}props: {\n${propsString}\n}`;
+	if (propsString || hasRestProp) {
+		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}${propsString ? `props: {\n${propsString}\n}, ` : ""}`;
 		const compOptions = macros.defineComponent.arguments[1];
-		if (!compOptions) s.appendRight(root.end, `, { ${resolvedPropsString} }`);
-		else if (compOptions.type === "ObjectExpression") {
-			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}, ...`);
+		if (compOptions) {
+			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}...`);
 			s.appendRight(compOptions.end, " }");
-		}
+		} else s.appendRight(root.end, `, { ${resolvedPropsString}}`);
 	}
 	transformAwait(root, s);
 }

package/dist/{core-CdCzk0z7.cjs → core-VBUl0Dxo.cjs}

@@ -703,14 +703,13 @@ function transformDefineComponent(root, propsName, macros, s) {
 	}
 	transformDefineModel$1(s, macros.defineModel, props);
 	const propsString = Object.entries(props).map(([key, value]) => `'${key}': ${value}`).join(", \n");
-	if (propsString) {
-		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}props: {\n${propsString}\n}`;
+	if (propsString || hasRestProp) {
+		const resolvedPropsString = `${hasRestProp ? "inheritAttrs: false, " : ""}${propsString ? `props: {\n${propsString}\n}, ` : ""}`;
 		const compOptions = macros.defineComponent.arguments[1];
-		if (!compOptions) s.appendRight(root.end, `, { ${resolvedPropsString} }`);
-		else if (compOptions.type === "ObjectExpression") {
-			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}, ...`);
+		if (compOptions) {
+			s.appendLeft(compOptions.start, `{ ${resolvedPropsString}...`);
 			s.appendRight(compOptions.end, " }");
-		}
+		} else s.appendRight(root.end, `, { ${resolvedPropsString}}`);
 	}
 	transformAwait(root, s);
 }

package/dist/esbuild.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/esbuild.ts
 var esbuild_default = require_src.src_default.esbuild;

package/dist/esbuild.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.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-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
 const require_options = require('./options-BMD1qLwt.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
 import { t as resolveOptions } from "./options-CmJjcwvr.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 export { src_default as default, resolveOptions };

package/dist/nuxt.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-const require_core = require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-require('./src-BOQ2_34z.cjs');
+const require_core = require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+require('./src-CoPAMYqD.cjs');
 const require_vite = require('./vite.cjs');
 const require_webpack = require('./webpack.cjs');
 let _nuxt_kit = require("@nuxt/kit");

package/dist/nuxt.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import "./src-CYiLMh2R.js";
 import vite_default from "./vite.js";
 import webpack_default from "./webpack.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";

package/dist/{raw-C1gVxL9_.js → raw-CFbxfplk.js}

@@ -1,4 +1,4 @@
-import { c as withDefaultsHelperId, d as use_model_default, i as getRequire, l as with_defaults_default, n as transformJsxMacros, o as useModelHelperId, s as useSlotsHelperId, u as use_slots_default } from "./core-C1igaRmI.js";
+import { c as withDefaultsHelperId, d as use_model_default, i as getRequire, l as with_defaults_default, n as transformJsxMacros, o as useModelHelperId, s as useSlotsHelperId, u as use_slots_default } from "./core-D8gdgBYJ.js";
 import { t as resolveOptions } from "./options-CmJjcwvr.js";
 
 //#region src/core/style.ts

package/dist/{raw-D3eCraWh.cjs → raw-DR5_tnEL.cjs}

@@ -1,4 +1,4 @@
-const require_core = require('./core-CdCzk0z7.cjs');
+const require_core = require('./core-VBUl0Dxo.cjs');
 const require_options = require('./options-BMD1qLwt.cjs');
 
 //#region src/core/style.ts

package/dist/raw.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-const require_raw = require('./raw-D3eCraWh.cjs');
+require('./core-VBUl0Dxo.cjs');
+const require_raw = require('./raw-DR5_tnEL.cjs');
 
 exports.default = require_raw.raw_default;

package/dist/raw.js

@@ -1,4 +1,4 @@
-import "./core-C1igaRmI.js";
-import { t as raw_default } from "./raw-C1gVxL9_.js";
+import "./core-D8gdgBYJ.js";
+import { t as raw_default } from "./raw-CFbxfplk.js";
 
 export { raw_default as default };

package/dist/rolldown.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/rolldown.ts
 var rolldown_default = require_src.src_default.rolldown;

package/dist/rolldown.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/rolldown.ts
 var rolldown_default = src_default.rolldown;

package/dist/rollup.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/rollup.ts
 var rollup_default = src_default.rollup;

package/dist/rspack.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/rspack.ts
 var rspack_default = src_default.rspack;

package/dist/{src-dlxx3Ofd.js → src-CYiLMh2R.js}

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

package/dist/{src-BOQ2_34z.cjs → src-CoPAMYqD.cjs}

@@ -1,5 +1,5 @@
-const require_core = require('./core-CdCzk0z7.cjs');
-const require_raw = require('./raw-D3eCraWh.cjs');
+const require_core = require('./core-VBUl0Dxo.cjs');
+const require_raw = require('./raw-DR5_tnEL.cjs');
 let unplugin = require("unplugin");
 
 //#region src/index.ts

package/dist/vite.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/vite.ts
 var vite_default = require_src.src_default.vite;

package/dist/vite.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/vite.ts
 var vite_default = src_default.vite;

package/dist/volar.cjs

@@ -1,5 +1,5 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-const require_core = require('./core-CdCzk0z7.cjs');
+const require_core = require('./core-VBUl0Dxo.cjs');
 const require_options = require('./options-BMD1qLwt.cjs');
 let ts_macro = require("ts-macro");
 let unplugin_utils = require("unplugin-utils");

package/dist/webpack.cjs

@@ -1,7 +1,7 @@
 Object.defineProperty(exports, '__esModule', { value: true });
-require('./core-CdCzk0z7.cjs');
-require('./raw-D3eCraWh.cjs');
-const require_src = require('./src-BOQ2_34z.cjs');
+require('./core-VBUl0Dxo.cjs');
+require('./raw-DR5_tnEL.cjs');
+const require_src = require('./src-CoPAMYqD.cjs');
 
 //#region src/webpack.ts
 var webpack_default = require_src.src_default.webpack;

package/dist/webpack.js

@@ -1,6 +1,6 @@
-import "./core-C1igaRmI.js";
-import "./raw-C1gVxL9_.js";
-import { t as src_default } from "./src-dlxx3Ofd.js";
+import "./core-D8gdgBYJ.js";
+import "./raw-CFbxfplk.js";
+import { t as src_default } from "./src-CYiLMh2R.js";
 
 //#region src/webpack.ts
 var webpack_default = src_default.webpack;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@vue-jsx-vapor/macros",
   "type": "module",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "description": "Macros for Vue JSX Vapor",
   "license": "MIT",
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",