Skip to content
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

feat(compiler-vapor): implement basic usage of v-slot #203

Merged
merged 7 commits into from
May 12, 2024
Merged

feat(compiler-vapor): implement basic usage of v-slot #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ba6167f
feat(compiler-vapor): static v-slot
LittleSound May 7, 2024
4526a7b
test: improve the test
LittleSound May 7, 2024
97a1251
feat(compiler-vapor): impl dynamic slot name
Doctor-wu May 8, 2024
c5ea21b
refactor(compiler-vapor): impl dynamic slot name + add error detection
LittleSound May 8, 2024
958a9ca
refactor
sxzz May 10, 2024
2800df5
refactor: undefined
sxzz May 11, 2024
58a5a03
refactor
sxzz May 11, 2024
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
19 changes: 10 additions & 9 deletions packages/compiler-vapor/__tests__/__snapshots__/compile.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,16 @@ const t0 = _template("<div></div>")
export function render(_ctx) {
const _component_Bar = _resolveComponent("Bar")
const _component_Comp = _resolveComponent("Comp")
const n0 = _createIf(() => (true), () => {
const n3 = t0()
const n2 = _createComponent(_component_Bar)
_withDirectives(n2, [[_resolveDirective("vHello"), void 0, void 0, { world: true }]])
_insert(n2, n3)
return n3
})
_insert(n0, n4)
const n4 = _createComponent(_component_Comp, null, true)
const n4 = _createComponent(_component_Comp, null, { default: () => {
const n0 = _createIf(() => (true), () => {
const n3 = t0()
const n2 = _createComponent(_component_Bar)
_withDirectives(n2, [[_resolveDirective("vHello"), void 0, void 0, { world: true }]])
_insert(n2, n3)
return n3
})
return n0
} }, null, true)
_withDirectives(n4, [[_resolveDirective("vTest")]])
return n4
}"
Expand Down
38 changes: 19 additions & 19 deletions packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ exports[`compiler: element transform > component > do not resolve component from

export function render(_ctx) {
const _component_Example = _resolveComponent("Example")
const n0 = _createComponent(_component_Example, null, true)
const n0 = _createComponent(_component_Example, null, null, null, true)
return n0
}"
`;
Expand All @@ -25,7 +25,7 @@ exports[`compiler: element transform > component > generate single root componen
"import { createComponent as _createComponent } from 'vue/vapor';

export function render(_ctx) {
const n0 = _createComponent(_ctx.Comp, null, true)
const n0 = _createComponent(_ctx.Comp, null, null, null, true)
return n0
}"
`;
Expand All @@ -35,21 +35,21 @@ exports[`compiler: element transform > component > import + resolve component 1`

export function render(_ctx) {
const _component_Foo = _resolveComponent("Foo")
const n0 = _createComponent(_component_Foo, null, true)
const n0 = _createComponent(_component_Foo, null, null, null, true)
return n0
}"
`;

exports[`compiler: element transform > component > resolve component from setup bindings (inline const) 1`] = `
"(() => {
const n0 = _createComponent(Example, null, true)
const n0 = _createComponent(Example, null, null, null, true)
return n0
})()"
`;

exports[`compiler: element transform > component > resolve component from setup bindings (inline) 1`] = `
"(() => {
const n0 = _createComponent(_unref(Example), null, true)
const n0 = _createComponent(_unref(Example), null, null, null, true)
return n0
})()"
`;
Expand All @@ -58,14 +58,14 @@ exports[`compiler: element transform > component > resolve component from setup
"import { createComponent as _createComponent } from 'vue/vapor';

export function render(_ctx) {
const n0 = _createComponent(_ctx.Example, null, true)
const n0 = _createComponent(_ctx.Example, null, null, null, true)
return n0
}"
`;

exports[`compiler: element transform > component > resolve namespaced component from props bindings (inline) 1`] = `
"(() => {
const n0 = _createComponent(Foo.Example, null, true)
const n0 = _createComponent(Foo.Example, null, null, null, true)
return n0
})()"
`;
Expand All @@ -74,14 +74,14 @@ exports[`compiler: element transform > component > resolve namespaced component
"import { createComponent as _createComponent } from 'vue/vapor';

export function render(_ctx) {
const n0 = _createComponent(_ctx.Foo.Example, null, true)
const n0 = _createComponent(_ctx.Foo.Example, null, null, null, true)
return n0
}"
`;

exports[`compiler: element transform > component > resolve namespaced component from setup bindings (inline const) 1`] = `
"(() => {
const n0 = _createComponent(Foo.Example, null, true)
const n0 = _createComponent(Foo.Example, null, null, null, true)
return n0
})()"
`;
Expand All @@ -90,7 +90,7 @@ exports[`compiler: element transform > component > resolve namespaced component
"import { createComponent as _createComponent } from 'vue/vapor';

export function render(_ctx) {
const n0 = _createComponent(_ctx.Foo.Example, null, true)
const n0 = _createComponent(_ctx.Foo.Example, null, null, null, true)
return n0
}"
`;
Expand All @@ -102,7 +102,7 @@ export function render(_ctx) {
const _component_Foo = _resolveComponent("Foo")
const n0 = _createComponent(_component_Foo, [
{ onBar: () => $event => (_ctx.handleBar($event)) }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -117,7 +117,7 @@ export function render(_ctx) {
id: () => ("foo"),
class: () => ("bar")
}
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -129,7 +129,7 @@ export function render(_ctx) {
const _component_Foo = _resolveComponent("Foo")
const n0 = _createComponent(_component_Foo, [
() => (_ctx.obj)
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -142,7 +142,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Foo, [
{ id: () => ("foo") },
() => (_ctx.obj)
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -155,7 +155,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Foo, [
() => (_ctx.obj),
{ id: () => ("foo") }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -169,7 +169,7 @@ export function render(_ctx) {
{ id: () => ("foo") },
() => (_ctx.obj),
{ class: () => ("bar") }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -181,7 +181,7 @@ export function render(_ctx) {
const _component_Foo = _resolveComponent("Foo")
const n0 = _createComponent(_component_Foo, [
() => (_toHandlers(_ctx.obj))
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -195,7 +195,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Foo, [
() => ({ [_toHandlerKey(_ctx.foo-_ctx.bar)]: () => _ctx.bar }),
() => ({ [_toHandlerKey(_ctx.baz)]: () => _ctx.qux })
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -208,7 +208,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Foo, [
() => ({ [_ctx.foo-_ctx.bar]: _ctx.bar }),
() => ({ [_ctx.baz]: _ctx.qux })
], true)
], null, null, true)
return n0
}"
`;
Expand Down
12 changes: 6 additions & 6 deletions packages/compiler-vapor/__tests__/transforms/__snapshots__/vModel.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function render(_ctx) {
{ modelValue: () => (_ctx.foo),
"onUpdate:modelValue": () => $event => (_ctx.foo = $event),
modelModifiers: () => ({ trim: true, "bar-baz": true }) }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -22,7 +22,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Comp, [
{ modelValue: () => (_ctx.foo),
"onUpdate:modelValue": () => $event => (_ctx.foo = $event) }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -41,7 +41,7 @@ export function render(_ctx) {
"onUpdate:bar": () => $event => (_ctx.bar = $event),
barModifiers: () => ({ number: true })
}
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -54,7 +54,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Comp, [
{ bar: () => (_ctx.foo),
"onUpdate:bar": () => $event => (_ctx.foo = $event) }
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -71,7 +71,7 @@ export function render(_ctx) {
() => ({ [_ctx.bar]: _ctx.bar,
["onUpdate:" + _ctx.bar]: () => $event => (_ctx.bar = $event),
[_ctx.bar + "Modifiers"]: () => ({ number: true }) })
], true)
], null, null, true)
return n0
}"
`;
Expand All @@ -84,7 +84,7 @@ export function render(_ctx) {
const n0 = _createComponent(_component_Comp, [
() => ({ [_ctx.arg]: _ctx.foo,
["onUpdate:" + _ctx.arg]: () => $event => (_ctx.foo = $event) })
], true)
], null, null, true)
return n0
}"
`;
Expand Down
73 changes: 73 additions & 0 deletions packages/compiler-vapor/__tests__/transforms/__snapshots__/vSlot.spec.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,73 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html

exports[`compiler: transform slot > dynamic slots name 1`] = `
"import { resolveComponent as _resolveComponent, createComponent as _createComponent, template as _template } from 'vue/vapor';
const t0 = _template("foo")

export function render(_ctx) {
const _component_Comp = _resolveComponent("Comp")
const n2 = _createComponent(_component_Comp, null, null, () => [{
name: _ctx.name,
fn: () => {
const n0 = t0()
return n0
}
}], true)
return n2
}"
`;

exports[`compiler: transform slot > implicit default slot 1`] = `
"import { resolveComponent as _resolveComponent, createComponent as _createComponent, template as _template } from 'vue/vapor';
const t0 = _template("<div></div>")

export function render(_ctx) {
const _component_Comp = _resolveComponent("Comp")
const n1 = _createComponent(_component_Comp, null, { default: () => {
const n0 = t0()
return n0
} }, null, true)
return n1
}"
`;

exports[`compiler: transform slot > named slots w/ implicit default slot 1`] = `
"import { resolveComponent as _resolveComponent, createComponent as _createComponent, template as _template } from 'vue/vapor';
const t0 = _template("foo")
const t1 = _template("bar")
const t2 = _template("<span></span>")

export function render(_ctx) {
const _component_Comp = _resolveComponent("Comp")
const n4 = _createComponent(_component_Comp, null, {
one: () => {
const n0 = t0()
return n0
},
default: () => {
const n2 = t1()
const n3 = t2()
return [n2, n3]
}
}, null, true)
return n4
}"
`;

exports[`compiler: transform slot > nested slots 1`] = `
"import { resolveComponent as _resolveComponent, createComponent as _createComponent, template as _template } from 'vue/vapor';
const t0 = _template("<div></div>")

export function render(_ctx) {
const _component_Bar = _resolveComponent("Bar")
const _component_Foo = _resolveComponent("Foo")
const n3 = _createComponent(_component_Foo, null, { one: () => {
const n1 = _createComponent(_component_Bar, null, { default: () => {
const n0 = t0()
return n0
} })
return n1
} }, null, true)
return n3
}"
`;
4 changes: 3 additions & 1 deletion packages/compiler-vapor/__tests__/transforms/transformElement.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ describe('compiler: element transform', () => {
bindingMetadata: { Comp: BindingTypes.SETUP_CONST },
})
expect(code).toMatchSnapshot()
expect(code).contains('_createComponent(_ctx.Comp, null, true)')
expect(code).contains(
'_createComponent(_ctx.Comp, null, null, null, true)',
)
})

test('generate multi root component', () => {
Expand Down
Loading
Loading