mirror of https://github.com/vuejs/core.git
refactor(compiler-vapor): rename dynamicFlags to flags
This commit is contained in:
parent
b8806f0954
commit
38a06394f7
|
@ -20,7 +20,7 @@ describe('compiler v-bind', () => {
|
||||||
|
|
||||||
expect(ir.dynamic.children[0]).toMatchObject({
|
expect(ir.dynamic.children[0]).toMatchObject({
|
||||||
id: 1,
|
id: 1,
|
||||||
dynamicFlags: DynamicFlag.REFERENCED,
|
flags: DynamicFlag.REFERENCED,
|
||||||
})
|
})
|
||||||
expect(ir.template[0]).toMatchObject({
|
expect(ir.template[0]).toMatchObject({
|
||||||
type: IRNodeTypes.TEMPLATE_FACTORY,
|
type: IRNodeTypes.TEMPLATE_FACTORY,
|
||||||
|
|
|
@ -280,14 +280,14 @@ function genChildren(children: IRDynamicInfo[]) {
|
||||||
let offset = 0
|
let offset = 0
|
||||||
|
|
||||||
for (const [index, child] of children.entries()) {
|
for (const [index, child] of children.entries()) {
|
||||||
if (child.dynamicFlags & DynamicFlag.NON_TEMPLATE) {
|
if (child.flags & DynamicFlag.NON_TEMPLATE) {
|
||||||
offset--
|
offset--
|
||||||
}
|
}
|
||||||
|
|
||||||
const idx = Number(index) + offset
|
const idx = Number(index) + offset
|
||||||
const id =
|
const id =
|
||||||
child.dynamicFlags & DynamicFlag.REFERENCED
|
child.flags & DynamicFlag.REFERENCED
|
||||||
? child.dynamicFlags & DynamicFlag.INSERT
|
? child.flags & DynamicFlag.INSERT
|
||||||
? child.anchor
|
? child.anchor
|
||||||
: child.id
|
: child.id
|
||||||
: null
|
: null
|
||||||
|
|
|
@ -198,7 +198,7 @@ export enum DynamicFlag {
|
||||||
|
|
||||||
export interface IRDynamicInfo {
|
export interface IRDynamicInfo {
|
||||||
id: number | null
|
id: number | null
|
||||||
dynamicFlags: DynamicFlag
|
flags: DynamicFlag
|
||||||
anchor: number | null
|
anchor: number | null
|
||||||
children: IRDynamicInfo[]
|
children: IRDynamicInfo[]
|
||||||
}
|
}
|
||||||
|
|
|
@ -101,7 +101,7 @@ const defaultOptions = {
|
||||||
|
|
||||||
export const genDefaultDynamic = (): IRDynamicInfo => ({
|
export const genDefaultDynamic = (): IRDynamicInfo => ({
|
||||||
id: null,
|
id: null,
|
||||||
dynamicFlags: 0,
|
flags: DynamicFlag.NONE,
|
||||||
anchor: null,
|
anchor: null,
|
||||||
children: [],
|
children: [],
|
||||||
})
|
})
|
||||||
|
@ -141,7 +141,7 @@ function createRootContext(
|
||||||
increaseId: () => globalId++,
|
increaseId: () => globalId++,
|
||||||
reference() {
|
reference() {
|
||||||
if (this.dynamic.id !== null) return this.dynamic.id
|
if (this.dynamic.id !== null) return this.dynamic.id
|
||||||
this.dynamic.dynamicFlags |= DynamicFlag.REFERENCED
|
this.dynamic.flags |= DynamicFlag.REFERENCED
|
||||||
return (this.dynamic.id = this.increaseId())
|
return (this.dynamic.id = this.increaseId())
|
||||||
},
|
},
|
||||||
registerEffect(expressions, operations) {
|
registerEffect(expressions, operations) {
|
||||||
|
@ -244,7 +244,7 @@ export function transform(
|
||||||
template: [],
|
template: [],
|
||||||
templateIndex: -1,
|
templateIndex: -1,
|
||||||
dynamic: extend(genDefaultDynamic(), {
|
dynamic: extend(genDefaultDynamic(), {
|
||||||
dynamicFlags: DynamicFlag.REFERENCED,
|
flags: DynamicFlag.REFERENCED,
|
||||||
} satisfies Partial<IRDynamicInfo>),
|
} satisfies Partial<IRDynamicInfo>),
|
||||||
effect: [],
|
effect: [],
|
||||||
operation: [],
|
operation: [],
|
||||||
|
@ -331,12 +331,12 @@ function processDynamicChildren(ctx: TransformContext<RootNode | ElementNode>) {
|
||||||
let hasStatic = false
|
let hasStatic = false
|
||||||
|
|
||||||
for (const [index, child] of ctx.dynamic.children.entries()) {
|
for (const [index, child] of ctx.dynamic.children.entries()) {
|
||||||
if (!child || !(child.dynamicFlags & DynamicFlag.INSERT)) {
|
if (!child || !(child.flags & DynamicFlag.INSERT)) {
|
||||||
if (prevChildren.length) {
|
if (prevChildren.length) {
|
||||||
if (hasStatic) {
|
if (hasStatic) {
|
||||||
ctx.childrenTemplate[index - prevChildren.length] = `<!>`
|
ctx.childrenTemplate[index - prevChildren.length] = `<!>`
|
||||||
|
|
||||||
prevChildren[0].dynamicFlags -= DynamicFlag.NON_TEMPLATE
|
prevChildren[0].flags -= DynamicFlag.NON_TEMPLATE
|
||||||
const anchor = (prevChildren[0].anchor = ctx.increaseId())
|
const anchor = (prevChildren[0].anchor = ctx.increaseId())
|
||||||
|
|
||||||
ctx.registerOperation({
|
ctx.registerOperation({
|
||||||
|
|
|
@ -27,7 +27,7 @@ export const transformInterpolation: NodeTransform = (node, ctx) => {
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
const id = ctx.reference()
|
const id = ctx.reference()
|
||||||
ctx.dynamic.dynamicFlags |= DynamicFlag.INSERT | DynamicFlag.NON_TEMPLATE
|
ctx.dynamic.flags |= DynamicFlag.INSERT | DynamicFlag.NON_TEMPLATE
|
||||||
ctx.registerOperation({
|
ctx.registerOperation({
|
||||||
type: IRNodeTypes.CREATE_TEXT_NODE,
|
type: IRNodeTypes.CREATE_TEXT_NODE,
|
||||||
loc: node.loc,
|
loc: node.loc,
|
||||||
|
|
|
@ -42,10 +42,10 @@ export function processIf(
|
||||||
dir.exp = createSimpleExpression(`true`, false, loc)
|
dir.exp = createSimpleExpression(`true`, false, loc)
|
||||||
}
|
}
|
||||||
|
|
||||||
context.dynamic.dynamicFlags |= DynamicFlag.NON_TEMPLATE
|
context.dynamic.flags |= DynamicFlag.NON_TEMPLATE
|
||||||
if (dir.name === 'if') {
|
if (dir.name === 'if') {
|
||||||
const id = context.reference()
|
const id = context.reference()
|
||||||
context.dynamic.dynamicFlags |= DynamicFlag.INSERT
|
context.dynamic.flags |= DynamicFlag.INSERT
|
||||||
const [branch, onExit] = createIfBranch(node, context)
|
const [branch, onExit] = createIfBranch(node, context)
|
||||||
|
|
||||||
return () => {
|
return () => {
|
||||||
|
@ -78,7 +78,7 @@ export function processIf(
|
||||||
) {
|
) {
|
||||||
if (__DEV__ && sibling.type === NodeTypes.COMMENT)
|
if (__DEV__ && sibling.type === NodeTypes.COMMENT)
|
||||||
comments.unshift(sibling)
|
comments.unshift(sibling)
|
||||||
siblingsDynamic[i].dynamicFlags |= DynamicFlag.NON_TEMPLATE
|
siblingsDynamic[i].flags |= DynamicFlag.NON_TEMPLATE
|
||||||
templates[i] = null
|
templates[i] = null
|
||||||
} else {
|
} else {
|
||||||
break
|
break
|
||||||
|
@ -154,7 +154,7 @@ export function createIfBranch(
|
||||||
node,
|
node,
|
||||||
templateIndex: -1,
|
templateIndex: -1,
|
||||||
dynamic: extend(genDefaultDynamic(), {
|
dynamic: extend(genDefaultDynamic(), {
|
||||||
dynamicFlags: DynamicFlag.REFERENCED,
|
flags: DynamicFlag.REFERENCED,
|
||||||
} satisfies Partial<IRDynamicInfo>),
|
} satisfies Partial<IRDynamicInfo>),
|
||||||
effect: [],
|
effect: [],
|
||||||
operation: [],
|
operation: [],
|
||||||
|
|
Loading…
Reference in New Issue