fix(compiler-vapor): generate assignment for v-model

packages/compiler-core/src/babelUtils.ts

@@ -275,8 +275,8 @@ export const isFunctionType = (node: Node): node is Function => {
   return /Function(?:Expression|Declaration)$|Method$/.test(node.type)
 }
 
-export const isStaticProperty = (node: Node): node is ObjectProperty =>
-  node &&
+export const isStaticProperty = (node?: Node): node is ObjectProperty =>
+  !!node &&
   (node.type === 'ObjectProperty' || node.type === 'ObjectMethod') &&
   !node.computed
 

packages/compiler-vapor/src/generators/expression.ts

@@ -20,6 +20,7 @@ import { isConstantExpression } from '../utils'
 export function genExpression(
   node: SimpleExpressionNode,
   context: CodegenContext,
+  assignment?: string,
 ): CodeFragment[] {
   const {
     options: { prefixIdentifiers },
@@ -38,12 +39,12 @@ export function genExpression(
     ast === false ||
     isConstantExpression(node)
   ) {
-    return [[rawExpr, NewlineType.None, loc]]
+    return [[rawExpr, NewlineType.None, loc], assignment && ` = ${assignment}`]
   }
 
   // the expression is a simple identifier
   if (ast === null) {
-    return genIdentifier(rawExpr, context, loc)
+    return genIdentifier(rawExpr, context, loc, assignment)
   }
 
   const ids: Identifier[] = []
@@ -81,6 +82,7 @@ export function genExpression(
             end: advancePositionWithClone(node.loc.start, source, end),
             source,
           },
+          assignment,
           id,
           parentStack[parentStack.length - 1],
           parentStack,
@@ -101,6 +103,7 @@ function genIdentifier(
   raw: string,
   { options, vaporHelper, identifiers }: CodegenContext,
   loc?: SourceLocation,
+  assignment?: string,
   id?: Identifier,
   parent?: Node,
   parentStack?: Node[],
@@ -114,7 +117,7 @@ function genIdentifier(
   }
 
   let prefix: string | undefined
-  if (isStaticProperty(parent!) && parent.shorthand) {
+  if (isStaticProperty(parent) && parent.shorthand) {
     // property shorthand like { foo }, we need to add the key since
     // we rewrite the value
     prefix = `${raw}: `
@@ -122,8 +125,13 @@ function genIdentifier(
 
   if (inline) {
     switch (bindingMetadata[raw]) {
+      case BindingTypes.SETUP_LET:
+        name = raw = assignment
+          ? `_isRef(${raw}) ? (${raw}.value = ${assignment}) : (${raw} = ${assignment})`
+          : unref()
+        break
       case BindingTypes.SETUP_REF:
-        name = raw = `${raw}.value`
+        name = raw = withAssignment(`${raw}.value`)
         break
       case BindingTypes.SETUP_MAYBE_REF:
         // ({ x } = y)
@@ -142,11 +150,22 @@ function genIdentifier(
         raw =
           isAssignmentLVal || isUpdateArg || isDestructureAssignment
             ? (name = `${raw}.value`)
-            : `${vaporHelper('unref')}(${raw})`
+            : assignment
+              ? `${vaporHelper('isRef')}(${raw}) ? (${raw}.value = ${assignment}) : null`
+              : unref()
         break
+      default:
+        raw = withAssignment(raw)
     }
   } else {
-    raw = `_ctx.${raw}`
+    raw = withAssignment(`_ctx.${raw}`)
   }
   return [prefix, [raw, NewlineType.None, loc, name]]
+
+  function withAssignment(s: string) {
+    return assignment ? `${s} = ${assignment}` : s
+  }
+  function unref() {
+    return `${vaporHelper('unref')}(${raw})`
+  }
 }

packages/compiler-vapor/src/generators/modelValue.ts

@@ -17,10 +17,9 @@ export function genSetModelValue(
     ? [JSON.stringify(`update:${camelize(oper.key.content)}`)]
     : ['`update:${', ...genExpression(oper.key, context), '}`']
   const handler = [
-    (isTS ? `($event: any)` : `$event`) + ' => ((',
-    // TODO handle not a ref
-    ...genExpression(oper.value, context),
-    ') = $event)',
+    (isTS ? `($event: any)` : `$event`) + ' => (',
+    ...genExpression(oper.value, context, '$event'),
+    ')',
   ]
 
   return [