chore: improve code

vuejs · Jan 3, 2023 · ea1ac87 · ea1ac87
1 parent 0fc0b19
commit ea1ac87
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/packages/compiler-ssr/__tests__/ssrVModel.spec.ts b/packages/compiler-ssr/__tests__/ssrVModel.spec.ts
@@ -39,15 +39,15 @@ describe('ssr: v-model', () => {
         `<select v-model="model"><option value="1"></option></select>`
       ).code
     ).toMatchInlineSnapshot(`
-      "const { ssrLooseContain: _ssrLooseContain, ssrLooseEqual: _ssrLooseEqual, ssrRenderAttrs: _ssrRenderAttrs } = require("vue/server-renderer")
+      "const { ssrIncludeBooleanAttr: _ssrIncludeBooleanAttr, ssrLooseContain: _ssrLooseContain, ssrLooseEqual: _ssrLooseEqual, ssrRenderAttrs: _ssrRenderAttrs } = require("vue/server-renderer")
 
       return function ssrRender(_ctx, _push, _parent, _attrs) {
         _push(\`<div\${
           _ssrRenderAttrs(_attrs)
         }><select><option value="1"\${
-          ((Array.isArray(_ctx.model))
+          (_ssrIncludeBooleanAttr((Array.isArray(_ctx.model))
             ? _ssrLooseContain(_ctx.model, "1")
-            : _ssrLooseEqual(_ctx.model, "1")) ? " selected" : ""
+            : _ssrLooseEqual(_ctx.model, "1"))) ? " selected" : ""
         }></option></select></div>\`)
       }"
     `)
@@ -57,15 +57,15 @@ describe('ssr: v-model', () => {
         `<select multiple v-model="model"><option value="1" selected></option><option value="2"></option></select>`
       ).code
     ).toMatchInlineSnapshot(`
-      "const { ssrLooseContain: _ssrLooseContain, ssrLooseEqual: _ssrLooseEqual, ssrRenderAttrs: _ssrRenderAttrs } = require("vue/server-renderer")
+      "const { ssrIncludeBooleanAttr: _ssrIncludeBooleanAttr, ssrLooseContain: _ssrLooseContain, ssrLooseEqual: _ssrLooseEqual, ssrRenderAttrs: _ssrRenderAttrs } = require("vue/server-renderer")
 
       return function ssrRender(_ctx, _push, _parent, _attrs) {
         _push(\`<div\${
           _ssrRenderAttrs(_attrs)
         }><select multiple><option value="1" selected></option><option value="2"\${
-          ((Array.isArray(_ctx.model))
+          (_ssrIncludeBooleanAttr((Array.isArray(_ctx.model))
             ? _ssrLooseContain(_ctx.model, "2")
-            : _ssrLooseEqual(_ctx.model, "2")) ? " selected" : ""
+            : _ssrLooseEqual(_ctx.model, "2"))) ? " selected" : ""
         }></option></select></div>\`)
       }"
     `)

diff --git a/packages/compiler-ssr/src/transforms/ssrVModel.ts b/packages/compiler-ssr/src/transforms/ssrVModel.ts
@@ -18,7 +18,8 @@ import {
 import {
   SSR_LOOSE_EQUAL,
   SSR_LOOSE_CONTAIN,
-  SSR_RENDER_DYNAMIC_MODEL
+  SSR_RENDER_DYNAMIC_MODEL,
+  SSR_INCLUDE_BOOLEAN_ATTR
 } from '../runtimeHelpers'
 import { DirectiveTransformResult } from 'packages/compiler-core/src/transform'
 
@@ -136,17 +137,19 @@ export const ssrTransformModel: DirectiveTransform = (dir, node, context) => {
             const value = findValueBinding(plainNode)
             plainNode.ssrCodegenNode!.elements.push(
               createConditionalExpression(
-                createConditionalExpression(
-                  createCallExpression(`Array.isArray`, [model]),
-                  createCallExpression(context.helper(SSR_LOOSE_CONTAIN), [
-                    model,
-                    value
-                  ]),
-                  createCallExpression(context.helper(SSR_LOOSE_EQUAL), [
-                    model,
-                    value
-                  ])
-                ),
+                createCallExpression(context.helper(SSR_INCLUDE_BOOLEAN_ATTR), [
+                  createConditionalExpression(
+                    createCallExpression(`Array.isArray`, [model]),
+                    createCallExpression(context.helper(SSR_LOOSE_CONTAIN), [
+                      model,
+                      value
+                    ]),
+                    createCallExpression(context.helper(SSR_LOOSE_EQUAL), [
+                      model,
+                      value
+                    ])
+                  )
+                ]),
                 createSimpleExpression(' selected', true),
                 createSimpleExpression('', true),
                 false /* no newline */