Skip to content

feat(compiler): emit lazy getter for scoped slot props #14494

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.

Sign up for GitHub

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
Mini-ghost wants to merge 1 commit into
base: minor
Choose a base branch
from
Open

feat(compiler): emit lazy getter for scoped slot props #14494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions packages-private/template-explorer/src/options.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ export const defaultOptions: CompilerOptions = {
setupConst: BindingTypes.SETUP_CONST,
setupLet: BindingTypes.SETUP_LET,
setupMaybeRef: BindingTypes.SETUP_MAYBE_REF,
setupComputed: BindingTypes.SETUP_COMPUTED,
setupProp: BindingTypes.PROPS,
vMySetupDir: BindingTypes.SETUP_CONST,
},
Expand Down
4 changes: 2 additions & 2 deletions packages/compiler-core/__tests__/transforms/__snapshots__/transformExpressions.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@

exports[`compiler: expression transform > bindingMetadata > inline mode 1`] = `
"(_ctx, _cache) => {
return (_openBlock(), _createElementBlock("div", null, _toDisplayString(__props.props) + " " + _toDisplayString(_unref(setup)) + " " + _toDisplayString(setupConst) + " " + _toDisplayString(_ctx.data) + " " + _toDisplayString(_ctx.options) + " " + _toDisplayString(isNaN.value), 1 /* TEXT */))
return (_openBlock(), _createElementBlock("div", null, _toDisplayString(__props.props) + " " + _toDisplayString(_unref(setup)) + " " + _toDisplayString(setupConst) + " " + _toDisplayString(_ctx.data) + " " + _toDisplayString(_ctx.options) + " " + _toDisplayString(isNaN.value) + " " + _toDisplayString(setupComputed.value), 1 /* TEXT */))
}"
`;

exports[`compiler: expression transform > bindingMetadata > non-inline mode 1`] = `
"const { toDisplayString: _toDisplayString, openBlock: _openBlock, createElementBlock: _createElementBlock } = Vue

return function render(_ctx, _cache, $props, $setup, $data, $options) {
return (_openBlock(), _createElementBlock("div", null, _toDisplayString($props.props) + " " + _toDisplayString($setup.setup) + " " + _toDisplayString($data.data) + " " + _toDisplayString($options.options) + " " + _toDisplayString($setup.isNaN), 1 /* TEXT */))
return (_openBlock(), _createElementBlock("div", null, _toDisplayString($props.props) + " " + _toDisplayString($setup.setup) + " " + _toDisplayString($data.data) + " " + _toDisplayString($options.options) + " " + _toDisplayString($setup.isNaN) + " " + _toDisplayString($setup.setupComputed), 1 /* TEXT */))
}"
`;

Expand Down
45 changes: 45 additions & 0 deletions packages/compiler-core/__tests__/transforms/transformElement.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,27 @@ describe('compiler: element transform', () => {
expect(node.tag).toBe(`_unref(Example)`)
})

test('resolve component from setup bindings (SETUP_COMPUTED)', () => {
const { root, node } = parseWithElementTransform(`<Example/>`, {
bindingMetadata: {
Example: BindingTypes.SETUP_COMPUTED,
},
})
expect(root.helpers).not.toContain(RESOLVE_COMPONENT)
expect(node.tag).toBe(`$setup["Example"]`)
})

test('resolve component from setup bindings (SETUP_COMPUTED inline)', () => {
const { root, node } = parseWithElementTransform(`<Example/>`, {
inline: true,
bindingMetadata: {
Example: BindingTypes.SETUP_COMPUTED,
},
})
expect(root.helpers).not.toContain(RESOLVE_COMPONENT)
expect(node.tag).toBe(`_unref(Example)`)
})

test('resolve component from setup bindings (inline const)', () => {
const { root, node } = parseWithElementTransform(`<Example/>`, {
inline: true,
Expand Down Expand Up @@ -1028,6 +1049,30 @@ describe('compiler: element transform', () => {
expect(node.patchFlag).toBe(PatchFlags.NEED_PATCH)
})

test('script setup inline mode template ref (SETUP_COMPUTED binding)', () => {
const { node } = parseWithElementTransform(`<input ref="input"/>`, {
inline: true,
bindingMetadata: {
input: BindingTypes.SETUP_COMPUTED,
},
})
expect(node.props).toMatchObject({
type: NodeTypes.JS_OBJECT_EXPRESSION,
properties: [
{
type: NodeTypes.JS_PROPERTY,
key: { content: 'ref_key', isStatic: true },
value: { content: 'input', isStatic: true },
},
{
type: NodeTypes.JS_PROPERTY,
key: { content: 'ref', isStatic: true },
value: { content: 'input', isStatic: false },
},
],
})
})

test('script setup inline mode template ref (binding exists)', () => {
const { node } = parseWithElementTransform(`<input ref="input"/>`, {
inline: true,
Expand Down
7 changes: 5 additions & 2 deletions packages/compiler-core/__tests__/transforms/transformExpressions.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -618,6 +618,7 @@ describe('compiler: expression transform', () => {
reactive: BindingTypes.SETUP_REACTIVE_CONST,
literal: BindingTypes.LITERAL_CONST,
isNaN: BindingTypes.SETUP_REF,
setupComputed: BindingTypes.SETUP_COMPUTED,
}

function compileWithBindingMetadata(
Expand All @@ -633,11 +634,12 @@ describe('compiler: expression transform', () => {

test('non-inline mode', () => {
const { code } = compileWithBindingMetadata(
`<div>{{ props }} {{ setup }} {{ data }} {{ options }} {{ isNaN }}</div>`,
`<div>{{ props }} {{ setup }} {{ data }} {{ options }} {{ isNaN }} {{ setupComputed }}</div>`,
)
expect(code).toMatch(`$props.props`)
expect(code).toMatch(`$setup.setup`)
expect(code).toMatch(`$setup.isNaN`)
expect(code).toMatch(`$setup.setupComputed`)
expect(code).toMatch(`$data.data`)
expect(code).toMatch(`$options.options`)
expect(code).toMatch(`_ctx, _cache, $props, $setup, $data, $options`)
Expand All @@ -646,7 +648,7 @@ describe('compiler: expression transform', () => {

test('inline mode', () => {
const { code } = compileWithBindingMetadata(
`<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }} {{ isNaN }}</div>`,
`<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }} {{ isNaN }} {{ setupComputed }}</div>`,
{ inline: true },
)
expect(code).toMatch(`__props.props`)
Expand All @@ -655,6 +657,7 @@ describe('compiler: expression transform', () => {
expect(code).toMatch(`_ctx.data`)
expect(code).toMatch(`_ctx.options`)
expect(code).toMatch(`isNaN.value`)
expect(code).toMatch(`setupComputed.value`)
expect(code).toMatchSnapshot()
})

Expand Down
Loading
Loading