@vue/compiler-sfc 3.4.24 → 3.4.26

package/dist/compiler-sfc.cjs.js

@@ -1,5 +1,5 @@
 /**
-* @vue/compiler-sfc v3.4.24
+* @vue/compiler-sfc v3.4.26
 * (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.26";
 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.26
 * (c) 2018-present Yuxi (Evan) You and Vue contributors
 * @license MIT
 **/
@@ -17247,11 +17247,10 @@ const tokenizer$2 = new Tokenizer$1(stack, {
     }
   },
   onselfclosingtag(end) {
-    var _a;
     const name = currentOpenTag.tag;
     currentOpenTag.isSelfClosing = true;
     endOpenTag(end);
-    if (((_a = stack[0]) == null ? void 0 : _a.tag) === name) {
+    if (stack[0] && stack[0].tag === name) {
       onCloseTag(stack.shift(), end);
     }
   },
@@ -17557,7 +17556,7 @@ function endOpenTag(end) {
 function onText(content, start, end) {
   const parent = stack[0] || currentRoot;
   const lastNode = parent.children[parent.children.length - 1];
-  if ((lastNode == null ? void 0 : lastNode.type) === 2) {
+  if (lastNode && lastNode.type === 2) {
     lastNode.content += content;
     setLocEnd(lastNode.loc, end);
   } else {
@@ -17633,11 +17632,10 @@ function isFragmentTemplate({ tag, props }) {
   return false;
 }
 function isComponent({ tag, props }) {
-  var _a;
   if (currentOptions.isCustomElement(tag)) {
     return false;
   }
-  if (tag === "component" || isUpperCase(tag.charCodeAt(0)) || isCoreComponent(tag) || ((_a = currentOptions.isBuiltInComponent) == null ? void 0 : _a.call(currentOptions, tag)) || currentOptions.isNativeTag && !currentOptions.isNativeTag(tag)) {
+  if (tag === "component" || isUpperCase(tag.charCodeAt(0)) || isCoreComponent(tag) || currentOptions.isBuiltInComponent && currentOptions.isBuiltInComponent(tag) || currentOptions.isNativeTag && !currentOptions.isNativeTag(tag)) {
     return true;
   }
   for (let i = 0; i < props.length; i++) {
@@ -17657,7 +17655,6 @@ function isUpperCase(c) {
 }
 const windowsNewlineRE = /\r\n/g;
 function condenseWhitespace(nodes, tag) {
-  var _a, _b;
   const shouldCondense = currentOptions.whitespace !== "preserve";
   let removedWhitespace = false;
   for (let i = 0; i < nodes.length; i++) {
@@ -17665,8 +17662,8 @@ function condenseWhitespace(nodes, tag) {
     if (node.type === 2) {
       if (!inPre) {
         if (isAllWhitespace(node.content)) {
-          const prev = (_a = nodes[i - 1]) == null ? void 0 : _a.type;
-          const next = (_b = nodes[i + 1]) == null ? void 0 : _b.type;
+          const prev = nodes[i - 1] && nodes[i - 1].type;
+          const next = nodes[i + 1] && nodes[i + 1].type;
           if (!prev || !next || shouldCondense && (prev === 3 && (next === 3 || next === 1) || prev === 1 && (next === 3 || next === 1 && hasNewlineChar(node.content)))) {
             removedWhitespace = true;
             nodes[i] = null;
@@ -17826,7 +17823,7 @@ function baseParse(input, options) {
   }
   tokenizer$2.mode = currentOptions.parseMode === "html" ? 1 : currentOptions.parseMode === "sfc" ? 2 : 0;
   tokenizer$2.inXML = currentOptions.ns === 1 || currentOptions.ns === 2;
-  const delimiters = options == null ? void 0 : options.delimiters;
+  const delimiters = options && options.delimiters;
   if (delimiters) {
     tokenizer$2.delimiterOpen = toCharCodes(delimiters[0]);
     tokenizer$2.delimiterClose = toCharCodes(delimiters[1]);
@@ -22510,7 +22507,6 @@ function genReturnStatement({ returns }, context) {
 }
 
 const isLiteralWhitelisted = /* @__PURE__ */ makeMap("true,false,null,this");
-const constantBailRE = /\w\s*\(|\.[^\d]/;
 const transformExpression = (node, context) => {
   if (node.type === 5) {
     node.content = processExpression(
@@ -22605,7 +22601,6 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
     return `_ctx.${raw}`;
   };
   const rawExp = node.content;
-  const bailConstant = constantBailRE.test(rawExp);
   let ast = node.ast;
   if (ast === false) {
     return node;
@@ -22664,7 +22659,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         node2.name = rewriteIdentifier(node2.name, parent, node2);
         ids.push(node2);
       } else {
-        if (!(needPrefix && isLocal) && !bailConstant) {
+        if (!(needPrefix && isLocal) && parent.type !== "CallExpression" && parent.type !== "NewExpression" && parent.type !== "MemberExpression") {
           node2.isConstant = true;
         }
         ids.push(node2);
@@ -22708,7 +22703,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
     ret.ast = ast;
   } else {
     ret = node;
-    ret.constType = bailConstant ? 0 : 3;
+    ret.constType = 3;
   }
   ret.identifiers = Object.keys(knownIds);
   return ret;
@@ -46882,29 +46877,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 +48364,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.4.24";
+const version = "3.4.26";
 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.26",
   "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.26",
+    "@vue/shared": "3.4.26",
+    "@vue/compiler-dom": "3.4.26",
+    "@vue/compiler-ssr": "3.4.26"
   },
   "devDependencies": {
     "@babel/types": "^7.24.0",