@vue-jsx-vapor/macros 3.2.8 → 3.2.9

package/dist/api.cjs

@@ -1,4 +1,4 @@
-const require_core = require('./core-VBUl0Dxo.cjs');
+const require_core = require('./core-CyGS7Va2.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-D8gdgBYJ.js";
+import { a as isFunctionalNode, n as transformJsxMacros, r as restructure, t as getMacroExpression } from "./core-Qf0K0TQC.js";
 
 export { getMacroExpression, isFunctionalNode, restructure, transformJsxMacros };

package/dist/astro.cjs

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

package/dist/astro.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
-const require_src = require('./src-CoPAMYqD.cjs');
+require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
+const require_src = require('./src-Qjj50LHy.cjs');
 
 //#region src/bun.ts
 var bun_default = require_src.src_default.bun;

package/dist/bun.js

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

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

@@ -672,13 +672,7 @@ function transformDefineComponent(root, propsName, macros, s) {
 					continue;
 				}
 				const defaultValue = getDefaultValue(prop.value.right);
-				let isRequired = false;
-				walkAST(prop.value.right, { enter(node) {
-					if (node.type === "TSNonNullExpression") {
-						isRequired = true;
-						this.skip();
-					}
-				} });
+				const isRequired = prop.value.right.type === "TSNonNullExpression";
 				const propOptions = [];
 				if (isRequired) propOptions.push("required: true");
 				if (defaultValue) {

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

@@ -643,13 +643,7 @@ function transformDefineComponent(root, propsName, macros, s) {
 					continue;
 				}
 				const defaultValue = getDefaultValue(prop.value.right);
-				let isRequired = false;
-				walkAST(prop.value.right, { enter(node) {
-					if (node.type === "TSNonNullExpression") {
-						isRequired = true;
-						this.skip();
-					}
-				} });
+				const isRequired = prop.value.right.type === "TSNonNullExpression";
 				const propOptions = [];
 				if (isRequired) propOptions.push("required: true");
 				if (defaultValue) {

package/dist/esbuild.cjs

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

package/dist/esbuild.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
+require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
 const require_options = require('./options-BMD1qLwt.cjs');
-const require_src = require('./src-CoPAMYqD.cjs');
+const require_src = require('./src-Qjj50LHy.cjs');
 
 exports.default = require_src.src_default;
 exports.resolveOptions = require_options.resolveOptions;

package/dist/index.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
 import { t as resolveOptions } from "./options-CmJjcwvr.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
-require('./src-CoPAMYqD.cjs');
+const require_core = require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
+require('./src-Qjj50LHy.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-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import "./src-BoqluMMt.js";
 import vite_default from "./vite.js";
 import webpack_default from "./webpack.js";
 import { addVitePlugin, addWebpackPlugin, defineNuxtModule } from "@nuxt/kit";

package/dist/{raw-CFbxfplk.js → raw-BTUP7Cbc.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-D8gdgBYJ.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-Qf0K0TQC.js";
 import { t as resolveOptions } from "./options-CmJjcwvr.js";
 
 //#region src/core/style.ts

package/dist/{raw-DR5_tnEL.cjs → raw-C-xS65ku.cjs}

@@ -1,4 +1,4 @@
-const require_core = require('./core-VBUl0Dxo.cjs');
+const require_core = require('./core-CyGS7Va2.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-VBUl0Dxo.cjs');
-const require_raw = require('./raw-DR5_tnEL.cjs');
+require('./core-CyGS7Va2.cjs');
+const require_raw = require('./raw-C-xS65ku.cjs');
 
 exports.default = require_raw.raw_default;

package/dist/raw.js

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

package/dist/rolldown.cjs

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

package/dist/rolldown.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
-const require_src = require('./src-CoPAMYqD.cjs');
+require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
+const require_src = require('./src-Qjj50LHy.cjs');
 
 //#region src/rollup.ts
 var rollup_default = require_src.src_default.rollup;

package/dist/rollup.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
-const require_src = require('./src-CoPAMYqD.cjs');
+require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
+const require_src = require('./src-Qjj50LHy.cjs');
 
 //#region src/rspack.ts
 var rspack_default = require_src.src_default.rspack;

package/dist/rspack.js

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

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

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

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

@@ -1,5 +1,5 @@
-const require_core = require('./core-VBUl0Dxo.cjs');
-const require_raw = require('./raw-DR5_tnEL.cjs');
+const require_core = require('./core-CyGS7Va2.cjs');
+const require_raw = require('./raw-C-xS65ku.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-VBUl0Dxo.cjs');
-require('./raw-DR5_tnEL.cjs');
-const require_src = require('./src-CoPAMYqD.cjs');
+require('./core-CyGS7Va2.cjs');
+require('./raw-C-xS65ku.cjs');
+const require_src = require('./src-Qjj50LHy.cjs');
 
 //#region src/vite.ts
 var vite_default = require_src.src_default.vite;

package/dist/vite.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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-VBUl0Dxo.cjs');
+const require_core = require('./core-CyGS7Va2.cjs');
 const require_options = require('./options-BMD1qLwt.cjs');
 let ts_macro = require("ts-macro");
 let unplugin_utils = require("unplugin-utils");
@@ -175,9 +175,7 @@ function transformJsxMacros(rootMap, options) {
 				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)) {
-					const isRequired = element.forEachChild(function isNonNullExpression(node) {
-						return ts.isNonNullExpression(node) || !!node.forEachChild(isNonNullExpression);
-					});
+					const isRequired = element.initializer && ts.isNonNullExpression(element.initializer);
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
 				const isDefineComponent = macros.defineComponent && ["defineComponent", "defineCustomElement"].includes(macros.defineComponent.expression.getText(ast));

package/dist/volar.js

@@ -173,9 +173,7 @@ function transformJsxMacros(rootMap, options) {
 				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)) {
-					const isRequired = element.forEachChild(function isNonNullExpression(node) {
-						return ts.isNonNullExpression(node) || !!node.forEachChild(isNonNullExpression);
-					});
+					const isRequired = element.initializer && ts.isNonNullExpression(element.initializer);
 					props.push(`${element.name.escapedText}${isRequired ? ":" : "?:"} typeof ${element.name.escapedText}`);
 				}
 				const isDefineComponent = macros.defineComponent && ["defineComponent", "defineCustomElement"].includes(macros.defineComponent.expression.getText(ast));

package/dist/webpack.cjs

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

package/dist/webpack.js

@@ -1,6 +1,6 @@
-import "./core-D8gdgBYJ.js";
-import "./raw-CFbxfplk.js";
-import { t as src_default } from "./src-CYiLMh2R.js";
+import "./core-Qf0K0TQC.js";
+import "./raw-BTUP7Cbc.js";
+import { t as src_default } from "./src-BoqluMMt.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.8",
+  "version": "3.2.9",
   "description": "Macros for Vue JSX Vapor",
   "license": "MIT",
   "homepage": "https://github.com/vuejs/vue-jsx-vapor#readme",