@vue/compiler-sfc 3.4.4 → 3.4.6

package/dist/compiler-sfc.cjs.js

@@ -19098,7 +19098,8 @@ function processDefineModel(ctx, node, declId) {
   let modelName;
   let options;
   const arg0 = node.arguments[0] && CompilerDOM.unwrapTSNode(node.arguments[0]);
-  if (arg0 && arg0.type === "StringLiteral") {
+  const hasName = arg0 && arg0.type === "StringLiteral";
+  if (hasName) {
     modelName = arg0.value;
     options = node.arguments[1];
   } else {
@@ -19109,29 +19110,27 @@ function processDefineModel(ctx, node, declId) {
     ctx.error(`duplicate model name ${JSON.stringify(modelName)}`, node);
   }
   let optionsString = options && ctx.getString(options);
-  let runtimeOptions = "";
-  let transformOptions = "";
-  if (options) {
-    if (options.type === "ObjectExpression") {
-      for (let i = options.properties.length - 1; i >= 0; i--) {
-        const p = options.properties[i];
-        if (p.type === "SpreadElement" || p.computed) {
-          runtimeOptions = optionsString;
-          break;
-        }
-        if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
-          transformOptions = ctx.getString(p) + ", " + transformOptions;
-          const offset = p.start - options.start;
-          const next = options.properties[i + 1];
-          const end = (next ? next.start : options.end - 1) - options.start;
-          optionsString = optionsString.slice(0, offset) + optionsString.slice(end);
-        }
-      }
-      if (!runtimeOptions && transformOptions) {
-        runtimeOptions = `{ ${transformOptions} }`;
+  let optionsRemoved = !options;
+  if (options && options.type === "ObjectExpression" && !options.properties.some((p) => p.type === "SpreadElement" || p.computed)) {
+    let removed = 0;
+    for (let i = options.properties.length - 1; i >= 0; i--) {
+      const p = options.properties[i];
+      const next = options.properties[i + 1];
+      const start = p.start;
+      const end = next ? next.start : options.end - 1;
+      if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
+        optionsString = optionsString.slice(0, start - options.start) + optionsString.slice(end - options.start);
+      } else {
+        removed++;
+        ctx.s.remove(ctx.startOffset + start, ctx.startOffset + end);
       }
-    } else {
-      runtimeOptions = optionsString;
+    }
+    if (removed === options.properties.length) {
+      optionsRemoved = true;
+      ctx.s.remove(
+        ctx.startOffset + (hasName ? arg0.end : options.start),
+        ctx.startOffset + options.end
+      );
     }
   }
   ctx.modelDecls[modelName] = {
@@ -19141,9 +19140,13 @@ function processDefineModel(ctx, node, declId) {
   };
   ctx.bindingMetadata[modelName] = "props";
   ctx.s.overwrite(
-    ctx.startOffset + node.start,
-    ctx.startOffset + node.end,
-    `${ctx.helper("useModel")}(__props, ${JSON.stringify(modelName)}${runtimeOptions ? `, ${runtimeOptions}` : ``})`
+    ctx.startOffset + node.callee.start,
+    ctx.startOffset + node.callee.end,
+    ctx.helper("useModel")
+  );
+  ctx.s.appendLeft(
+    ctx.startOffset + (node.arguments.length ? node.arguments[0].start : node.end - 1),
+    `__props, ` + (hasName ? `` : `${JSON.stringify(modelName)}${optionsRemoved ? `` : `, `}`)
   );
   return true;
 }
@@ -20591,7 +20594,7 @@ function isStaticNode(node) {
   return false;
 }
 
-const version = "3.4.4";
+const version = "3.4.6";
 const parseCache = parseCache$1;
 const errorMessages = {
   ...CompilerDOM.errorMessages,

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

@@ -17098,6 +17098,18 @@ function isInDestructureAssignment(parent, parentStack) {
   }
   return false;
 }
+function isInNewExpression(parentStack) {
+  let i = parentStack.length;
+  while (i--) {
+    const p = parentStack[i];
+    if (p.type === "NewExpression") {
+      return true;
+    } else if (p.type !== "MemberExpression") {
+      break;
+    }
+  }
+  return false;
+}
 function walkFunctionParams(node, onIdent) {
   for (const p of node.params) {
     for (const id of extractIdentifiers$1(p)) {
@@ -22974,12 +22986,17 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
       const isAssignmentLVal = parent && parent.type === "AssignmentExpression" && parent.left === id;
       const isUpdateArg = parent && parent.type === "UpdateExpression" && parent.argument === id;
       const isDestructureAssignment = parent && isInDestructureAssignment(parent, parentStack);
+      const isNewExpression = parent && isInNewExpression(parentStack);
+      const wrapWithUnref = (raw2) => {
+        const wrapped = `${context.helperString(UNREF)}(${raw2})`;
+        return isNewExpression ? `(${wrapped})` : wrapped;
+      };
       if (isConst(type) || type === "setup-reactive-const" || localVars[raw]) {
         return raw;
       } else if (type === "setup-ref") {
         return `${raw}.value`;
       } else if (type === "setup-maybe-ref") {
-        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : `${context.helperString(UNREF)}(${raw})`;
+        return isAssignmentLVal || isUpdateArg || isDestructureAssignment ? `${raw}.value` : wrapWithUnref(raw);
       } else if (type === "setup-let") {
         if (isAssignmentLVal) {
           const { right: rVal, operator } = parent;
@@ -23006,7 +23023,7 @@ function processExpression(node, context, asParams = false, asRawStatements = fa
         } else if (isDestructureAssignment) {
           return raw;
         } else {
-          return `${context.helperString(UNREF)}(${raw})`;
+          return wrapWithUnref(raw);
         }
       } else if (type === "props") {
         return genPropsAccessExp(raw);
@@ -25796,6 +25813,7 @@ var CompilerDOM = /*#__PURE__*/Object.freeze({
   isCoreComponent: isCoreComponent,
   isFunctionType: isFunctionType,
   isInDestructureAssignment: isInDestructureAssignment,
+  isInNewExpression: isInNewExpression,
   isMemberExpression: isMemberExpression,
   isMemberExpressionBrowser: isMemberExpressionBrowser,
   isMemberExpressionNode: isMemberExpressionNode,
@@ -31986,7 +32004,7 @@ function subTransform(node, options, parentContext) {
 function clone(v) {
   if (isArray$3(v)) {
     return v.map(clone);
-  } else if (isObject$2(v)) {
+  } else if (isPlainObject(v)) {
     const res = {};
     for (const key in v) {
       res[key] = clone(v[key]);
@@ -47086,7 +47104,8 @@ function processDefineModel(ctx, node, declId) {
   let modelName;
   let options;
   const arg0 = node.arguments[0] && unwrapTSNode(node.arguments[0]);
-  if (arg0 && arg0.type === "StringLiteral") {
+  const hasName = arg0 && arg0.type === "StringLiteral";
+  if (hasName) {
     modelName = arg0.value;
     options = node.arguments[1];
   } else {
@@ -47097,29 +47116,27 @@ function processDefineModel(ctx, node, declId) {
     ctx.error(`duplicate model name ${JSON.stringify(modelName)}`, node);
   }
   let optionsString = options && ctx.getString(options);
-  let runtimeOptions = "";
-  let transformOptions = "";
-  if (options) {
-    if (options.type === "ObjectExpression") {
-      for (let i = options.properties.length - 1; i >= 0; i--) {
-        const p = options.properties[i];
-        if (p.type === "SpreadElement" || p.computed) {
-          runtimeOptions = optionsString;
-          break;
-        }
-        if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
-          transformOptions = ctx.getString(p) + ", " + transformOptions;
-          const offset = p.start - options.start;
-          const next = options.properties[i + 1];
-          const end = (next ? next.start : options.end - 1) - options.start;
-          optionsString = optionsString.slice(0, offset) + optionsString.slice(end);
-        }
-      }
-      if (!runtimeOptions && transformOptions) {
-        runtimeOptions = `{ ${transformOptions} }`;
+  let optionsRemoved = !options;
+  if (options && options.type === "ObjectExpression" && !options.properties.some((p) => p.type === "SpreadElement" || p.computed)) {
+    let removed = 0;
+    for (let i = options.properties.length - 1; i >= 0; i--) {
+      const p = options.properties[i];
+      const next = options.properties[i + 1];
+      const start = p.start;
+      const end = next ? next.start : options.end - 1;
+      if ((p.type === "ObjectProperty" || p.type === "ObjectMethod") && (p.key.type === "Identifier" && (p.key.name === "get" || p.key.name === "set") || p.key.type === "StringLiteral" && (p.key.value === "get" || p.key.value === "set"))) {
+        optionsString = optionsString.slice(0, start - options.start) + optionsString.slice(end - options.start);
+      } else {
+        removed++;
+        ctx.s.remove(ctx.startOffset + start, ctx.startOffset + end);
       }
-    } else {
-      runtimeOptions = optionsString;
+    }
+    if (removed === options.properties.length) {
+      optionsRemoved = true;
+      ctx.s.remove(
+        ctx.startOffset + (hasName ? arg0.end : options.start),
+        ctx.startOffset + options.end
+      );
     }
   }
   ctx.modelDecls[modelName] = {
@@ -47129,9 +47146,13 @@ function processDefineModel(ctx, node, declId) {
   };
   ctx.bindingMetadata[modelName] = "props";
   ctx.s.overwrite(
-    ctx.startOffset + node.start,
-    ctx.startOffset + node.end,
-    `${ctx.helper("useModel")}(__props, ${JSON.stringify(modelName)}${runtimeOptions ? `, ${runtimeOptions}` : ``})`
+    ctx.startOffset + node.callee.start,
+    ctx.startOffset + node.callee.end,
+    ctx.helper("useModel")
+  );
+  ctx.s.appendLeft(
+    ctx.startOffset + (node.arguments.length ? node.arguments[0].start : node.end - 1),
+    `__props, ` + (hasName ? `` : `${JSON.stringify(modelName)}${optionsRemoved ? `` : `, `}`)
   );
   return true;
 }
@@ -48609,7 +48630,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
-const version = "3.4.4";
+const version = "3.4.6";
 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.4",
+  "version": "3.4.6",
   "description": "@vue/compiler-sfc",
   "main": "dist/compiler-sfc.cjs.js",
   "module": "dist/compiler-sfc.esm-browser.js",
@@ -37,10 +37,10 @@
     "magic-string": "^0.30.5",
     "postcss": "^8.4.32",
     "source-map-js": "^1.0.2",
-    "@vue/compiler-core": "3.4.4",
-    "@vue/shared": "3.4.4",
-    "@vue/compiler-dom": "3.4.4",
-    "@vue/compiler-ssr": "3.4.4"
+    "@vue/compiler-core": "3.4.6",
+    "@vue/compiler-ssr": "3.4.6",
+    "@vue/shared": "3.4.6",
+    "@vue/compiler-dom": "3.4.6"
   },
   "devDependencies": {
     "@babel/types": "^7.23.6",