From: Evan You <yyx990803@gmail.com>
Date: Fri, 30 Oct 2020 19:29:38 +0000 (-0400)
Subject: fix: handle case of ref declaration without initial value
X-Git-Tag: v3.0.3~50^2~23
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8485cd48437bf47880a61b03c57090e8bfdf527b;p=thirdparty%2Fvuejs%2Fcore.git

fix: handle case of ref declaration without initial value
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index 69937bc9e7..7865e20d7e 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -292,6 +292,7 @@ exports[`SFC compile <script setup> ref: syntax sugar convert ref declarations 1
 
 export function setup() {
 
+      const foo = ref()
       const a = ref(1)
       const b = ref({
         count: 0
@@ -299,7 +300,7 @@ export function setup() {
       let c = () => {}
       let d
       
-return { a, b, c, d }
+return { foo, a, b, c, d }
 }
 
 export default { setup }"
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 7c17d42d1d..e1f2c8ae81 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -259,6 +259,7 @@ describe('SFC compile <script setup>', () => {
   describe('ref: syntax sugar', () => {
     test('convert ref declarations', () => {
       const { content, bindings } = compile(`<script setup>
+      ref: foo
       ref: a = 1
       ref: b = {
         count: 0
@@ -267,7 +268,10 @@ describe('SFC compile <script setup>', () => {
       let d
       </script>`)
       expect(content).toMatch(`import { ref } from 'vue'`)
+      expect(content).not.toMatch(`ref: foo`)
       expect(content).not.toMatch(`ref: a`)
+      expect(content).not.toMatch(`ref: b`)
+      expect(content).toMatch(`const foo = ref()`)
       expect(content).toMatch(`const a = ref(1)`)
       expect(content).toMatch(`
       const b = ref({
@@ -279,6 +283,7 @@ describe('SFC compile <script setup>', () => {
       expect(content).toMatch(`let d`)
       assertCode(content)
       expect(bindings).toStrictEqual({
+        foo: 'setup',
         a: 'setup',
         b: 'setup',
         c: 'setup',
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 3572cedce4..9b93717cc1 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -155,11 +155,7 @@ export function compileScript(
       helperImports.add('ref')
       const { left, right } = exp
       if (left.type === 'Identifier') {
-        if (left.name[0] === '$') {
-          error(`ref variable identifiers cannot start with $.`, left)
-        }
-        refBindings[left.name] = setupBindings[left.name] = true
-        refIdentifiers.add(left)
+        registerRefBinding(left)
         s.prependRight(right.start! + startOffset, `ref(`)
         s.appendLeft(right.end! + startOffset, ')')
       } else if (left.type === 'ObjectPattern') {
@@ -186,11 +182,22 @@ export function compileScript(
       // possible multiple declarations
       // ref: x = 1, y = 2
       exp.expressions.forEach(e => processRefExpression(e, statement))
+    } else if (exp.type === 'Identifier') {
+      registerRefBinding(exp)
+      s.appendLeft(exp.end! + startOffset, ` = ref()`)
     } else {
       error(`ref: statements can only contain assignment expressions.`, exp)
     }
   }
 
+  function registerRefBinding(id: Identifier) {
+    if (id.name[0] === '$') {
+      error(`ref variable identifiers cannot start with $.`, id)
+    }
+    refBindings[id.name] = setupBindings[id.name] = true
+    refIdentifiers.add(id)
+  }
+
   function processRefObjectPattern(
     pattern: ObjectPattern,
     statement: LabeledStatement
@@ -227,9 +234,7 @@ export function compileScript(
         s.prependRight(nameId.start! + startOffset, `__`)
       }
       if (nameId) {
-        // register binding
-        refBindings[nameId.name] = setupBindings[nameId.name] = true
-        refIdentifiers.add(nameId)
+        registerRefBinding(nameId)
         // append binding declarations after the parent statement
         s.appendLeft(
           statement.end! + startOffset,
@@ -261,10 +266,9 @@ export function compileScript(
         processRefArrayPattern(e, statement)
       }
       if (nameId) {
+        registerRefBinding(nameId)
+        // prefix original
         s.prependRight(nameId.start! + startOffset, `__`)
-        // register binding
-        refBindings[nameId.name] = setupBindings[nameId.name] = true
-        refIdentifiers.add(nameId)
         // append binding declarations after the parent statement
         s.appendLeft(
           statement.end! + startOffset,