wip: support resolving directives from setup scope variables by naming convention

v-my-dir can be resovled from setup scope variable named "vMyDir".
This commit is contained in:
Evan You
2020-11-23 16:32:24 -05:00
parent 2f32e4a077
commit ae2caad740
4 changed files with 121 additions and 35 deletions

View File

@@ -29,8 +29,7 @@ import {
isObject,
isReservedProp,
capitalize,
camelize,
EMPTY_OBJ
camelize
} from '@vue/shared'
import { createCompilerError, ErrorCodes } from '../errors'
import {
@@ -255,34 +254,16 @@ export function resolveComponentType(
}
// 3. user component (from setup bindings)
const bindings = context.bindingMetadata
if (bindings !== EMPTY_OBJ) {
const checkType = (type: BindingTypes) => {
let resolvedTag = tag
if (
bindings[resolvedTag] === type ||
bindings[(resolvedTag = camelize(tag))] === type ||
bindings[(resolvedTag = capitalize(camelize(tag)))] === type
) {
return resolvedTag
}
}
const tagFromConst = checkType(BindingTypes.SETUP_CONST)
if (tagFromConst) {
return context.inline
? // in inline mode, const setup bindings (e.g. imports) can be used as-is
tagFromConst
: `$setup[${JSON.stringify(tagFromConst)}]`
}
const tagFromSetup =
checkType(BindingTypes.SETUP_LET) ||
checkType(BindingTypes.SETUP_REF) ||
checkType(BindingTypes.SETUP_MAYBE_REF)
if (tagFromSetup) {
return context.inline
? // setup scope bindings that may be refs need to be unrefed
`${context.helperString(UNREF)}(${tagFromSetup})`
: `$setup[${JSON.stringify(tagFromSetup)}]`
// this is skipped in browser build since browser builds do not perform
// binding analysis.
if (!__BROWSER__) {
const fromSetup = resolveSetupReference(
tag,
capitalize(camelize(tag)),
context
)
if (fromSetup) {
return fromSetup
}
}
@@ -292,6 +273,45 @@ export function resolveComponentType(
return toValidAssetId(tag, `component`)
}
function resolveSetupReference(
name: string,
interopName: string,
context: TransformContext
) {
const bindings = context.bindingMetadata
if (!bindings) {
return
}
const checkType = (type: BindingTypes) => {
if (bindings[name] === type) {
return name
}
if (bindings[interopName] === type) {
return interopName
}
}
const fromConst = checkType(BindingTypes.SETUP_CONST)
if (fromConst) {
return context.inline
? // in inline mode, const setup bindings (e.g. imports) can be used as-is
fromConst
: `$setup[${JSON.stringify(fromConst)}]`
}
const fromMaybeRef =
checkType(BindingTypes.SETUP_LET) ||
checkType(BindingTypes.SETUP_REF) ||
checkType(BindingTypes.SETUP_MAYBE_REF)
if (fromMaybeRef) {
return context.inline
? // setup scope bindings that may be refs need to be unrefed
`${context.helperString(UNREF)}(${fromMaybeRef})`
: `$setup[${JSON.stringify(fromMaybeRef)}]`
}
}
export type PropsExpression = ObjectExpression | CallExpression | ExpressionNode
export function buildProps(
@@ -590,12 +610,28 @@ function buildDirectiveArgs(
const dirArgs: ArrayExpression['elements'] = []
const runtime = directiveImportMap.get(dir)
if (runtime) {
// built-in directive with runtime
dirArgs.push(context.helperString(runtime))
} else {
// inject statement for resolving directive
context.helper(RESOLVE_DIRECTIVE)
context.directives.add(dir.name)
dirArgs.push(toValidAssetId(dir.name, `directive`))
// 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
)
if (fromSetup) {
dirArgs.push(fromSetup)
} else {
// inject statement for resolving directive
context.helper(RESOLVE_DIRECTIVE)
context.directives.add(dir.name)
dirArgs.push(toValidAssetId(dir.name, `directive`))
}
}
const { loc } = dir
if (dir.exp) dirArgs.push(dir.exp)