Skip to content

fix(compile-vapor): ensure component node is initialized before applyVShow is called #12951

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: vapor
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,5 +1,16 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`compiler: v-show transform > on component 1`] = `
"import { resolveComponent as _resolveComponent, createComponentWithFallback as _createComponentWithFallback, applyVShow as _applyVShow } from 'vue';

export function render(_ctx) {
const _component_Comp = _resolveComponent("Comp")
const n0 = _createComponentWithFallback(_component_Comp, null, null, true)
_applyVShow(n0, () => (_ctx.foo))
return n0
}"
`;

exports[`compiler: v-show transform > simple expression 1`] = `
"import { applyVShow as _applyVShow, template as _template } from 'vue';
const t0 = _template("<div></div>", true)
Expand Down
5 changes: 5 additions & 0 deletions packages/compiler-vapor/__tests__/transforms/vShow.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,9 @@ describe('compiler: v-show transform', () => {
}),
)
})

test('on component', () => {
const { code } = compileWithVShow(`<Comp v-show="foo"/>`)
expect(code).toMatchSnapshot()
})
})
10 changes: 7 additions & 3 deletions packages/compiler-vapor/src/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class TransformContext<T extends AllNode = AllNode> {
isStaticExpression(e, this.root.options.bindingMetadata),
)
) {
return this.registerOperation(...operations)
return operations.forEach(op => this.registerOperation(op))
}

this.block.expressions.push(...expressions)
Expand All @@ -172,8 +172,12 @@ export class TransformContext<T extends AllNode = AllNode> {
}
}

registerOperation(...node: OperationNode[]): void {
this.block.operation.push(...node)
registerOperation(node: OperationNode, index?: number): void {
if (index !== undefined) {
this.block.operation.splice(index, 0, node)
} else {
this.block.operation.push(node)
}
}

create<T extends TemplateChildNode>(
Expand Down
35 changes: 23 additions & 12 deletions packages/compiler-vapor/src/transforms/transformElement.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ import {
type VaporDirectiveNode,
} from '../ir'
import { EMPTY_EXPRESSION } from './utils'
import { findProp } from '../utils'
import { findDir, findProp } from '../utils'

export const isReservedProp: (key: string) => boolean = /*#__PURE__*/ makeMap(
// the leading comma is intentional so empty string "" is also included
Expand Down Expand Up @@ -124,17 +124,28 @@ function transformComponentElement(
}

context.dynamic.flags |= DynamicFlag.NON_TEMPLATE | DynamicFlag.INSERT
context.registerOperation({
type: IRNodeTypes.CREATE_COMPONENT_NODE,
id: context.reference(),
tag,
props: propsResult[0] ? propsResult[1] : [propsResult[1]],
asset,
root: singleRoot,
slots: [...context.slots],
once: context.inVOnce,
dynamic: dynamicComponent,
})

// ensure v-show is handled after the component is created
let showOperationIndex
if (findDir(node, 'show')) {
showOperationIndex = context.block.operation.findIndex(
op => op.type === IRNodeTypes.DIRECTIVE && op.name === 'show',
)
}
context.registerOperation(
{
type: IRNodeTypes.CREATE_COMPONENT_NODE,
id: context.reference(),
tag,
props: propsResult[0] ? propsResult[1] : [propsResult[1]],
asset,
root: singleRoot,
slots: [...context.slots],
once: context.inVOnce,
dynamic: dynamicComponent,
},
showOperationIndex,
)
context.slots = []
}

Expand Down