theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wip(compiler): generate blocks for v-if

Browse Source
This commit is contained in:
Evan You
2019-10-01 12:25:13 -04:00
parent e31fb3c172
commit 5de744d4e1
21 changed files with 359 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
packages/compiler-core/src/transforms/transformElement.ts
View File

@@ -148,7 +148,6 @@ export function buildProps(
patchFlag: number
dynamicPropNames: string[]
} {
let isStatic = true
let properties: ObjectExpression['properties'] = []
const mergeArgs: PropsExpression[] = []
const runtimeDirectives: DirectiveNode[] = []
@@ -180,13 +179,11 @@ export function buildProps(
value ? value.content : '',
true,
value ? value.loc : loc
),
loc
)
)
)
} else {
// directives
isStatic = false
const { name, arg, exp, loc } = prop
// skip v-slot - it is handled by its dedicated transform.
@@ -297,11 +294,6 @@ export function buildProps(
)
}
// hoist the object if it's fully static
if (isStatic && propsExpression) {
propsExpression = context.hoist(propsExpression)
}
// determine the flags to add
if (hasDynammicKeys) {
patchFlag |= PatchFlags.FULL_PROPS
@@ -391,8 +383,7 @@ function createDirectiveArgs(
dir.modifiers.map(modifier =>
createObjectProperty(
createSimpleExpression(modifier, true, loc),
createSimpleExpression(`true`, false, loc),
loc
createSimpleExpression(`true`, false, loc)
)
),
loc

2
packages/compiler-core/src/transforms/transformExpression.ts
View File

@@ -192,7 +192,7 @@ export function processExpression(
let ret
if (children.length) {
ret = createCompoundExpression(children, node.loc)
ret = createCompoundExpression(children)
} else {
ret = node
}

17
packages/compiler-core/src/transforms/transfromSlotOutlet.ts
View File

@@ -43,16 +43,13 @@ export const transformSlotOutlet: NodeTransform = (node, context) => {
arg.content === `name`
) {
// dynamic :name="xxx"
slot = createCompoundExpression(
[
$slots + `[`,
...(exp.type === NodeTypes.SIMPLE_EXPRESSION
? [exp]
: exp.children),
`]`
],
loc
)
slot = createCompoundExpression([
$slots + `[`,
...(exp.type === NodeTypes.SIMPLE_EXPRESSION
? [exp]
: exp.children),
`]`
])
nameIndex = i
break
}

3
packages/compiler-core/src/transforms/vBind.ts
View File

@@ -30,8 +30,7 @@ export const transformBind: DirectiveTransform = (dir, context) => {
return {
props: createObjectProperty(
arg!,
exp || createSimpleExpression('', true, loc),
loc
exp || createSimpleExpression('', true, loc)
),
needRuntime: false
}

140
packages/compiler-core/src/transforms/vIf.ts
View File

@@ -1,6 +1,7 @@
import {
createStructuralDirectiveTransform,
traverseChildren
traverseChildren,
TransformContext
} from '../transform'
import {
NodeTypes,
@@ -8,25 +9,66 @@ import {
ElementNode,
DirectiveNode,
IfBranchNode,
SimpleExpressionNode
SimpleExpressionNode,
createSequenceExpression,
createCallExpression,
createConditionalExpression,
ConditionalExpression,
CallExpression,
createSimpleExpression,
JSChildNode,
ObjectExpression,
createObjectProperty,
Property
} from '../ast'
import { createCompilerError, ErrorCodes } from '../errors'
import { processExpression } from './transformExpression'
import {
OPEN_BLOCK,
CREATE_BLOCK,
EMPTY,
FRAGMENT,
APPLY_DIRECTIVES
} from '../runtimeConstants'
import { isString } from '@vue/shared'
export const transformIf = createStructuralDirectiveTransform(
/^(if|else|else-if)$/,
(node, dir, context) => {
if (
dir.name !== 'else' &&
(!dir.exp || !(dir.exp as SimpleExpressionNode).content.trim())
) {
const loc = dir.exp ? dir.exp.loc : node.loc
context.onError(createCompilerError(ErrorCodes.X_IF_NO_EXPRESSION, loc))
dir.exp = createSimpleExpression(`true`, false, loc)
}
if (!__BROWSER__ && context.prefixIdentifiers && dir.exp) {
// dir.exp can only be simple expression because vIf transform is applied
// before expression transform.
processExpression(dir.exp as SimpleExpressionNode, context)
dir.exp = processExpression(dir.exp as SimpleExpressionNode, context)
}
if (dir.name === 'if') {
const codegenNode = createSequenceExpression([
createCallExpression(context.helper(OPEN_BLOCK))
])
context.replaceNode({
type: NodeTypes.IF,
loc: node.loc,
branches: [createIfBranch(node, dir)]
branches: [createIfBranch(node, dir)],
codegenNode
})
// Exit callback. Complete the codegenNode when all children have been
// transformed.
return () => {
codegenNode.expressions.push(
createCodegenNodeForBranch(node, dir, 0, context)
)
}
} else {
// locate the adjacent v-if
const siblings = context.parent!.children
@@ -50,6 +92,25 @@ export const transformIf = createStructuralDirectiveTransform(
// since the branch was removed, it will not be traversed.
// make sure to traverse here.
traverseChildren(branch, context)
// attach this branch's codegen node to the v-if root.
let parentCondition = sibling.codegenNode
.expressions[1] as ConditionalExpression
while (true) {
if (
parentCondition.alternate.type ===
NodeTypes.JS_CONDITIONAL_EXPRESSION
) {
parentCondition = parentCondition.alternate
} else {
parentCondition.alternate = createCodegenNodeForBranch(
node,
dir,
sibling.branches.length - 1,
context
)
break
}
}
} else {
context.onError(
createCompilerError(
@@ -74,3 +135,74 @@ function createIfBranch(node: ElementNode, dir: DirectiveNode): IfBranchNode {
children: node.tagType === ElementTypes.TEMPLATE ? node.children : [node]
}
}
function createCodegenNodeForBranch(
node: ElementNode,
dir: DirectiveNode,
index: number,
context: TransformContext
): ConditionalExpression | CallExpression {
if (dir.exp) {
return createConditionalExpression(
dir.exp,
createChildrenCodegenNode(node, index, context),
createCallExpression(context.helper(CREATE_BLOCK), [
context.helper(EMPTY)
])
)
} else {
return createChildrenCodegenNode(node, index, context)
}
}
function createChildrenCodegenNode(
node: ElementNode,
index: number,
{ helper }: TransformContext
): CallExpression {
const isTemplate = node.tagType === ElementTypes.TEMPLATE
const keyExp = `{ key: ${index} }`
if (isTemplate) {
return createCallExpression(helper(CREATE_BLOCK), [
helper(FRAGMENT),
keyExp,
node.children
])
} else {
let childCodegen = node.codegenNode!
if (childCodegen.callee === helper(APPLY_DIRECTIVES)) {
childCodegen = childCodegen.arguments[0] as CallExpression
}
// change child to a block
childCodegen.callee = helper(CREATE_BLOCK)
// branch key
const existingProps = childCodegen.arguments[1]
if (!existingProps || existingProps === `null`) {
childCodegen.arguments[1] = keyExp
} else {
// inject branch key if not already have a key
const props = existingProps as CallExpression | ObjectExpression
if (props.type === NodeTypes.JS_CALL_EXPRESSION) {
// merged props... add ours
// only inject key to object literal if it's the first argument so that
// if doesn't override user provided keys
const first = props.arguments[0] as string | JSChildNode
if (!isString(first) && first.type === NodeTypes.JS_OBJECT_EXPRESSION) {
first.properties.unshift(createKeyProperty(index))
} else {
props.arguments.unshift(keyExp)
}
} else {
props.properties.unshift(createKeyProperty(index))
}
}
return childCodegen
}
}
function createKeyProperty(index: number): Property {
return createObjectProperty(
createSimpleExpression(`key`, true),
createSimpleExpression(index + '', false)
)
}

5
packages/compiler-core/src/transforms/vOn.ts
View File

@@ -27,7 +27,7 @@ export const transformOn: DirectiveTransform = (dir, context) => {
arg.loc
)
} else {
eventName = createCompoundExpression([`"on" + (`, arg, `)`], arg.loc)
eventName = createCompoundExpression([`"on" + (`, arg, `)`])
}
} else {
// already a compound epxression.
@@ -40,8 +40,7 @@ export const transformOn: DirectiveTransform = (dir, context) => {
return {
props: createObjectProperty(
eventName,
exp || createSimpleExpression(`() => {}`, false, loc),
loc
exp || createSimpleExpression(`() => {}`, false, loc)
),
needRuntime: false
}

3
packages/compiler-core/src/transforms/vSlot.ts
View File

@@ -144,7 +144,6 @@ function buildSlot(
slotProps,
children,
children.length ? children[0].loc : loc
),
loc
)
)
}