From: Evan You <yyx990803@gmail.com>
Date: Fri, 25 Jun 2021 18:05:59 +0000 (-0400)
Subject: fix(compiler-sfc): fix defineProps() call on imported identifier
X-Git-Tag: v3.1.3~43
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=691d354af9e3a66c781494656b367950fcd8faec;p=thirdparty%2Fvuejs%2Fcore.git

fix(compiler-sfc): fix defineProps() call on imported identifier
---

diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index d65806a49a..5e80e97908 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -73,6 +73,23 @@ return {  }
 }"
 `;
 
+exports[`SFC compile <script setup> defineProps w/ external definition 1`] = `
+"import { propsModel } from './props'
+    
+export default {
+  props: propsModel,
+  setup(__props, { expose }) {
+  expose()
+
+const props = __props
+    
+    
+return { props, propsModel }
+}
+
+}"
+`;
+
 exports[`SFC compile <script setup> defineProps() 1`] = `
 "export default {
   props: {
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 085e2956f7..e0c2c5584b 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -48,6 +48,19 @@ const bar = 1
 },`)
   })
 
+  test('defineProps w/ external definition', () => {
+    const { content } = compile(`
+    <script setup>
+    import { defineProps } from 'vue'
+    import { propsModel } from './props'
+    const props = defineProps(propsModel)
+    </script>
+      `)
+    assertCode(content)
+    expect(content).toMatch(`export default {
+  props: propsModel,`)
+  })
+
   test('defineEmit() (deprecated)', () => {
     const { content, bindings } = compile(`
 <script setup>
diff --git a/packages/compiler-sfc/src/compileScript.ts b/packages/compiler-sfc/src/compileScript.ts
index 08f4863444..0eacf1f6ce 100644
--- a/packages/compiler-sfc/src/compileScript.ts
+++ b/packages/compiler-sfc/src/compileScript.ts
@@ -1492,7 +1492,15 @@ export function walkIdentifiers(
   })
 }
 
-function isRefIdentifier(id: Identifier, parent: Node, parentStack: Node[]) {
+function isRefIdentifier(
+  id: Identifier,
+  parent: Node | null,
+  parentStack: Node[]
+) {
+  if (!parent) {
+    return true
+  }
+
   // declaration id
   if (
     (parent.type === 'VariableDeclarator' ||