From 69d5c6887e51687044da25ef671c690d193000d7 Mon Sep 17 00:00:00 2001
From: Evan You <yyx990803@gmail.com>
Date: Tue, 24 Nov 2020 19:04:03 -0500
Subject: [PATCH] wip: update directive scope variable mapping

---
 .../src/transforms/transformElement.ts        | 31 ++++++-------------
 .../__snapshots__/compileScript.spec.ts.snap  |  4 +--
 .../__tests__/compileScript.spec.ts           |  4 +--
 3 files changed, 14 insertions(+), 25 deletions(-)

diff --git a/packages/compiler-core/src/transforms/transformElement.ts b/packages/compiler-core/src/transforms/transformElement.ts
index c9d1a3ee4..ca1ae9d1b 100644
--- a/packages/compiler-core/src/transforms/transformElement.ts
+++ b/packages/compiler-core/src/transforms/transformElement.ts
@@ -257,11 +257,7 @@ export function resolveComponentType(
   // this is skipped in browser build since browser builds do not perform
   // binding analysis.
   if (!__BROWSER__) {
-    const fromSetup = resolveSetupReference(
-      tag,
-      capitalize(camelize(tag)),
-      context
-    )
+    const fromSetup = resolveSetupReference(tag, context)
     if (fromSetup) {
       return fromSetup
     }
@@ -273,22 +269,23 @@ export function resolveComponentType(
   return toValidAssetId(tag, `component`)
 }
 
-function resolveSetupReference(
-  name: string,
-  interopName: string,
-  context: TransformContext
-) {
+function resolveSetupReference(name: string, context: TransformContext) {
   const bindings = context.bindingMetadata
   if (!bindings) {
     return
   }
 
+  const camelName = camelize(name)
+  const PascalName = capitalize(camelName)
   const checkType = (type: BindingTypes) => {
     if (bindings[name] === type) {
       return name
     }
-    if (bindings[interopName] === type) {
-      return interopName
+    if (bindings[camelName] === type) {
+      return camelName
+    }
+    if (bindings[PascalName] === type) {
+      return PascalName
     }
   }
 
@@ -615,15 +612,7 @@ function buildDirectiveArgs(
   } else {
     // user directive.
     // see if we have directives exposed via <script setup>
-    const fromSetup =
-      !__BROWSER__ &&
-      resolveSetupReference(
-        dir.name,
-        // v-my-dir -> vMyDir
-        'v' + capitalize(camelize(dir.name)),
-        context
-      )
-
+    const fromSetup = !__BROWSER__ && resolveSetupReference(dir.name, context)
     if (fromSetup) {
       dirArgs.push(fromSetup)
     } else {
diff --git a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
index f925826c5..662693d24 100644
--- a/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
+++ b/packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
@@ -224,7 +224,7 @@ exports[`SFC compile <script setup> inlineTemplate mode referencing scope compon
 
 import ChildComp from './Child.vue'
         import SomeOtherComp from './Other.vue'
-        import vMyDir from './my-dir'
+        import myDir from './my-dir'
         
 export default {
   expose: [],
@@ -234,7 +234,7 @@ export default {
 return (_ctx, _cache) => {
   return (_openBlock(), _createBlock(_Fragment, null, [
     _withDirectives(_createVNode(\\"div\\", null, null, 512 /* NEED_PATCH */), [
-      [_unref(vMyDir)]
+      [_unref(myDir)]
     ]),
     _createVNode(ChildComp),
     _createVNode(SomeOtherComp)
diff --git a/packages/compiler-sfc/__tests__/compileScript.spec.ts b/packages/compiler-sfc/__tests__/compileScript.spec.ts
index 624ae425c..66b46b7dc 100644
--- a/packages/compiler-sfc/__tests__/compileScript.spec.ts
+++ b/packages/compiler-sfc/__tests__/compileScript.spec.ts
@@ -192,7 +192,7 @@ const myEmit = defineEmit(['foo', 'bar'])
         <script setup>
         import ChildComp from './Child.vue'
         import SomeOtherComp from './Other.vue'
-        import vMyDir from './my-dir'
+        import myDir from './my-dir'
         </script>
         <template>
           <div v-my-dir></div>
@@ -202,7 +202,7 @@ const myEmit = defineEmit(['foo', 'bar'])
         `,
         { inlineTemplate: true }
       )
-      expect(content).toMatch('[_unref(vMyDir)]')
+      expect(content).toMatch('[_unref(myDir)]')
       expect(content).toMatch('_createVNode(ChildComp)')
       // kebab-case component support
       expect(content).toMatch('_createVNode(SomeOtherComp)')