@vue/compiler-sfc 3.4.24 → 3.4.25

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.4.24
+* @vue/compiler-sfc v3.4.25
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -19306,29 +19306,39 @@ function genModelProps(ctx) {
     return;
   const isProd = !!ctx.options.isProd;
   let modelPropsDecl = "";
-  for (const [name, { type, options }] of Object.entries(ctx.modelDecls)) {
+  for (const [name, { type, options: runtimeOptions }] of Object.entries(
+    ctx.modelDecls
+  )) {
     let skipCheck = false;
+    let codegenOptions = ``;
     let runtimeTypes = type && inferRuntimeType(ctx, type);
     if (runtimeTypes) {
       const hasBoolean = runtimeTypes.includes("Boolean");
+      const hasFunction = runtimeTypes.includes("Function");
       const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE);
-      if (isProd || hasUnknownType) {
-        runtimeTypes = runtimeTypes.filter(
-          (t) => t === "Boolean" || hasBoolean && t === "String" || t === "Function" && options
-        );
-        skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      if (hasUnknownType) {
+        if (hasBoolean || hasFunction) {
+          runtimeTypes = runtimeTypes.filter((t) => t !== UNKNOWN_TYPE);
+          skipCheck = true;
+        } else {
+          runtimeTypes = ["null"];
+        }
       }
+      if (!isProd) {
+        codegenOptions = `type: ${toRuntimeTypeString(runtimeTypes)}` + (skipCheck ? ", skipCheck: true" : "");
+      } else if (hasBoolean || runtimeOptions && hasFunction) {
+        codegenOptions = `type: ${toRuntimeTypeString(runtimeTypes)}`;
+      } else ;
     }
-    let runtimeType = runtimeTypes && runtimeTypes.length > 0 && toRuntimeTypeString(runtimeTypes) || void 0;
-    const codegenOptions = concatStrings([
-      runtimeType && `type: ${runtimeType}`,
-      skipCheck && "skipCheck: true"
-    ]);
     let decl;
-    if (runtimeType && options) {
-      decl = ctx.isTS ? `{ ${codegenOptions}, ...${options} }` : `Object.assign({ ${codegenOptions} }, ${options})`;
+    if (codegenOptions && runtimeOptions) {
+      decl = ctx.isTS ? `{ ${codegenOptions}, ...${runtimeOptions} }` : `Object.assign({ ${codegenOptions} }, ${runtimeOptions})`;
+    } else if (codegenOptions) {
+      decl = `{ ${codegenOptions} }`;
+    } else if (runtimeOptions) {
+      decl = runtimeOptions;
     } else {
-      decl = options || (runtimeType ? `{ ${codegenOptions} }` : "{}");
+      decl = `{}`;
     }
     modelPropsDecl += `
     ${JSON.stringify(name)}: ${decl},`;
@@ -20753,7 +20763,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.24";
+const version = "3.4.25";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

package/dist/compiler-sfc.esm-browser.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.4.24
+* @vue/compiler-sfc v3.4.25
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -46882,29 +46882,39 @@ function genModelProps(ctx) {
     return;
   const isProd = !!ctx.options.isProd;
   let modelPropsDecl = "";
-  for (const [name, { type, options }] of Object.entries(ctx.modelDecls)) {
+  for (const [name, { type, options: runtimeOptions }] of Object.entries(
+    ctx.modelDecls
+  )) {
     let skipCheck = false;
+    let codegenOptions = ``;
     let runtimeTypes = type && inferRuntimeType(ctx, type);
     if (runtimeTypes) {
       const hasBoolean = runtimeTypes.includes("Boolean");
+      const hasFunction = runtimeTypes.includes("Function");
       const hasUnknownType = runtimeTypes.includes(UNKNOWN_TYPE);
-      if (isProd || hasUnknownType) {
-        runtimeTypes = runtimeTypes.filter(
-          (t) => t === "Boolean" || hasBoolean && t === "String" || t === "Function" && options
-        );
-        skipCheck = !isProd && hasUnknownType && runtimeTypes.length > 0;
+      if (hasUnknownType) {
+        if (hasBoolean || hasFunction) {
+          runtimeTypes = runtimeTypes.filter((t) => t !== UNKNOWN_TYPE);
+          skipCheck = true;
+        } else {
+          runtimeTypes = ["null"];
+        }
       }
+      if (!isProd) {
+        codegenOptions = `type: ${toRuntimeTypeString(runtimeTypes)}` + (skipCheck ? ", skipCheck: true" : "");
+      } else if (hasBoolean || runtimeOptions && hasFunction) {
+        codegenOptions = `type: ${toRuntimeTypeString(runtimeTypes)}`;
+      } else ;
     }
-    let runtimeType = runtimeTypes && runtimeTypes.length > 0 && toRuntimeTypeString(runtimeTypes) || void 0;
-    const codegenOptions = concatStrings([
-      runtimeType && `type: ${runtimeType}`,
-      skipCheck && "skipCheck: true"
-    ]);
     let decl;
-    if (runtimeType && options) {
-      decl = ctx.isTS ? `{ ${codegenOptions}, ...${options} }` : `Object.assign({ ${codegenOptions} }, ${options})`;
+    if (codegenOptions && runtimeOptions) {
+      decl = ctx.isTS ? `{ ${codegenOptions}, ...${runtimeOptions} }` : `Object.assign({ ${codegenOptions} }, ${runtimeOptions})`;
+    } else if (codegenOptions) {
+      decl = `{ ${codegenOptions} }`;
+    } else if (runtimeOptions) {
+      decl = runtimeOptions;
     } else {
-      decl = options || (runtimeType ? `{ ${codegenOptions} }` : "{}");
+      decl = `{}`;
     }
     modelPropsDecl += `
     ${JSON.stringify(name)}: ${decl},`;
@@ -48359,7 +48369,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.4.24";
+const version = "3.4.25";
 const parseCache = parseCache$1;
 const errorMessages = __spreadValues(__spreadValues({}, errorMessages$1), DOMErrorMessages);
 const walk = walk$2;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-sfc",
-  "version": "3.4.24",
+  "version": "3.4.25",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -47,10 +47,10 @@
     "magic-string": "^0.30.10",
     "postcss": "^8.4.38",
     "source-map-js": "^1.2.0",
-    "@vue/compiler-core": "3.4.24",
-    "@vue/compiler-dom": "3.4.24",
-    "@vue/compiler-ssr": "3.4.24",
-    "@vue/shared": "3.4.24"
+    "@vue/compiler-core": "3.4.25",
+    "@vue/compiler-ssr": "3.4.25",
+    "@vue/compiler-dom": "3.4.25",
+    "@vue/shared": "3.4.25"
   },
   "devDependencies": {
     "@babel/types": "^7.24.0",