From: 三咲智子 Kevin Deng Date: Tue, 30 Jan 2024 14:52:42 +0000 (+0800) Subject: refactor(compiler-vapor): rename dynamicFlags to flags X-Git-Tag: v3.6.0-alpha.1~16^2~627 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=38a06394f7b7895c141d9c3b40c5291d0a1913be;p=thirdparty%2Fvuejs%2Fcore.git refactor(compiler-vapor): rename dynamicFlags to flags --- diff --git a/packages/compiler-vapor/__tests__/transforms/vBind.spec.ts b/packages/compiler-vapor/__tests__/transforms/vBind.spec.ts index da02641c9d..49137fb617 100644 --- a/packages/compiler-vapor/__tests__/transforms/vBind.spec.ts +++ b/packages/compiler-vapor/__tests__/transforms/vBind.spec.ts @@ -20,7 +20,7 @@ describe('compiler v-bind', () => { expect(ir.dynamic.children[0]).toMatchObject({ id: 1, - dynamicFlags: DynamicFlag.REFERENCED, + flags: DynamicFlag.REFERENCED, }) expect(ir.template[0]).toMatchObject({ type: IRNodeTypes.TEMPLATE_FACTORY, diff --git a/packages/compiler-vapor/src/generate.ts b/packages/compiler-vapor/src/generate.ts index 9eb561035c..f9c39c4284 100644 --- a/packages/compiler-vapor/src/generate.ts +++ b/packages/compiler-vapor/src/generate.ts @@ -280,14 +280,14 @@ function genChildren(children: IRDynamicInfo[]) { let offset = 0 for (const [index, child] of children.entries()) { - if (child.dynamicFlags & DynamicFlag.NON_TEMPLATE) { + if (child.flags & DynamicFlag.NON_TEMPLATE) { offset-- } const idx = Number(index) + offset const id = - child.dynamicFlags & DynamicFlag.REFERENCED - ? child.dynamicFlags & DynamicFlag.INSERT + child.flags & DynamicFlag.REFERENCED + ? child.flags & DynamicFlag.INSERT ? child.anchor : child.id : null diff --git a/packages/compiler-vapor/src/ir.ts b/packages/compiler-vapor/src/ir.ts index ae57c64890..ac44a55389 100644 --- a/packages/compiler-vapor/src/ir.ts +++ b/packages/compiler-vapor/src/ir.ts @@ -198,7 +198,7 @@ export enum DynamicFlag { export interface IRDynamicInfo { id: number | null - dynamicFlags: DynamicFlag + flags: DynamicFlag anchor: number | null children: IRDynamicInfo[] } diff --git a/packages/compiler-vapor/src/transform.ts b/packages/compiler-vapor/src/transform.ts index c168e509f2..b6e231f92b 100644 --- a/packages/compiler-vapor/src/transform.ts +++ b/packages/compiler-vapor/src/transform.ts @@ -101,7 +101,7 @@ const defaultOptions = { export const genDefaultDynamic = (): IRDynamicInfo => ({ id: null, - dynamicFlags: 0, + flags: DynamicFlag.NONE, anchor: null, children: [], }) @@ -141,7 +141,7 @@ function createRootContext( increaseId: () => globalId++, reference() { 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()) }, registerEffect(expressions, operations) { @@ -244,7 +244,7 @@ export function transform( template: [], templateIndex: -1, dynamic: extend(genDefaultDynamic(), { - dynamicFlags: DynamicFlag.REFERENCED, + flags: DynamicFlag.REFERENCED, } satisfies Partial), effect: [], operation: [], @@ -331,12 +331,12 @@ function processDynamicChildren(ctx: TransformContext) { let hasStatic = false 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 (hasStatic) { ctx.childrenTemplate[index - prevChildren.length] = `` - prevChildren[0].dynamicFlags -= DynamicFlag.NON_TEMPLATE + prevChildren[0].flags -= DynamicFlag.NON_TEMPLATE const anchor = (prevChildren[0].anchor = ctx.increaseId()) ctx.registerOperation({ diff --git a/packages/compiler-vapor/src/transforms/transformInterpolation.ts b/packages/compiler-vapor/src/transforms/transformInterpolation.ts index 4648cb7883..5c15633f2d 100644 --- a/packages/compiler-vapor/src/transforms/transformInterpolation.ts +++ b/packages/compiler-vapor/src/transforms/transformInterpolation.ts @@ -27,7 +27,7 @@ export const transformInterpolation: NodeTransform = (node, ctx) => { ) } else { const id = ctx.reference() - ctx.dynamic.dynamicFlags |= DynamicFlag.INSERT | DynamicFlag.NON_TEMPLATE + ctx.dynamic.flags |= DynamicFlag.INSERT | DynamicFlag.NON_TEMPLATE ctx.registerOperation({ type: IRNodeTypes.CREATE_TEXT_NODE, loc: node.loc, diff --git a/packages/compiler-vapor/src/transforms/vIf.ts b/packages/compiler-vapor/src/transforms/vIf.ts index 12486c56b3..3628ad7fe0 100644 --- a/packages/compiler-vapor/src/transforms/vIf.ts +++ b/packages/compiler-vapor/src/transforms/vIf.ts @@ -42,10 +42,10 @@ export function processIf( dir.exp = createSimpleExpression(`true`, false, loc) } - context.dynamic.dynamicFlags |= DynamicFlag.NON_TEMPLATE + context.dynamic.flags |= DynamicFlag.NON_TEMPLATE if (dir.name === 'if') { const id = context.reference() - context.dynamic.dynamicFlags |= DynamicFlag.INSERT + context.dynamic.flags |= DynamicFlag.INSERT const [branch, onExit] = createIfBranch(node, context) return () => { @@ -78,7 +78,7 @@ export function processIf( ) { if (__DEV__ && sibling.type === NodeTypes.COMMENT) comments.unshift(sibling) - siblingsDynamic[i].dynamicFlags |= DynamicFlag.NON_TEMPLATE + siblingsDynamic[i].flags |= DynamicFlag.NON_TEMPLATE templates[i] = null } else { break @@ -154,7 +154,7 @@ export function createIfBranch( node, templateIndex: -1, dynamic: extend(genDefaultDynamic(), { - dynamicFlags: DynamicFlag.REFERENCED, + flags: DynamicFlag.REFERENCED, } satisfies Partial), effect: [], operation: [],