Skip to content

Commit 95bd686

Browse files
edison1105edison1105
committed
wip: update test
1 parent 76c024d commit 95bd686

File tree

4 files changed

+76
-127
lines changed

4 files changed

+76
-127
lines changed

‎packages/compiler-vapor/__tests__/transforms/__snapshots__/transformElement.spec.ts.snap

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -309,18 +309,15 @@ export function render(_ctx) {
309309
`;
310310
311311
exports[`compiler: element transform > props merging: event handlers 1`] = `
312-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
312+
"import { withKeys as _withKeys } from 'vue';
313+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
313314
const t0 = _template("<div></div>")
314315
_delegateEvents("click")
315316
316317
export function render(_ctx) {
317318
const n0 = t0()
318-
_delegate(n0, "click", () => _ctx.a, {
319-
keys: ["foo"]
320-
})
321-
_delegate(n0, "click", () => _ctx.b, {
322-
keys: ["bar"]
323-
})
319+
_delegate(n0, "click", () => _withKeys(_ctx.a, ["foo"]))
320+
_delegate(n0, "click", () => _withKeys(_ctx.b, ["bar"]))
324321
return n0
325322
}"
326323
`;

‎packages/compiler-vapor/__tests__/transforms/__snapshots__/vOn.spec.ts.snap

Lines changed: 52 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,8 @@ export function render(_ctx) {
5858
`;
5959

6060
exports[`v-on > event modifier 1`] = `
61-
"import { delegate as _delegate, on as _on, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
61+
"import { withModifiers as _withModifiers, withKeys as _withKeys } from 'vue';
62+
import { delegate as _delegate, on as _on, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
6263
const t0 = _template("<a></a>")
6364
const t1 = _template("<form></form>")
6465
const t2 = _template("<div></div>")
@@ -88,18 +89,10 @@ export function render(_ctx, $props, $emit, $attrs, $slots) {
8889
const n19 = t3()
8990
const n20 = t3()
9091
const n21 = t3()
91-
_delegate(n0, "click", () => _ctx.handleEvent, {
92-
modifiers: ["stop"]
93-
})
94-
_on(n1, "submit", () => _ctx.handleEvent, {
95-
modifiers: ["prevent"]
96-
})
97-
_delegate(n2, "click", () => _ctx.handleEvent, {
98-
modifiers: ["stop", "prevent"]
99-
})
100-
_delegate(n3, "click", () => _ctx.handleEvent, {
101-
modifiers: ["self"]
102-
})
92+
_delegate(n0, "click", () => _withModifiers(_ctx.handleEvent, ["stop"]))
93+
_on(n1, "submit", () => _withModifiers(_ctx.handleEvent, ["prevent"]))
94+
_delegate(n2, "click", () => _withModifiers(_ctx.handleEvent, ["stop","prevent"]))
95+
_delegate(n3, "click", () => _withModifiers(_ctx.handleEvent, ["self"]))
10396
_on(n4, "click", () => _ctx.handleEvent, {
10497
capture: true
10598
})
@@ -109,53 +102,21 @@ export function render(_ctx, $props, $emit, $attrs, $slots) {
109102
_on(n6, "scroll", () => _ctx.handleEvent, {
110103
passive: true
111104
})
112-
_delegate(n7, "contextmenu", () => _ctx.handleEvent, {
113-
modifiers: ["right"]
114-
})
115-
_delegate(n8, "click", () => _ctx.handleEvent, {
116-
modifiers: ["left"]
117-
})
118-
_delegate(n9, "mouseup", () => _ctx.handleEvent, {
119-
modifiers: ["middle"]
120-
})
121-
_delegate(n10, "contextmenu", () => _ctx.handleEvent, {
122-
modifiers: ["right"],
123-
keys: ["enter"]
124-
})
125-
_delegate(n11, "keyup", () => _ctx.handleEvent, {
126-
keys: ["enter"]
127-
})
128-
_delegate(n12, "keyup", () => _ctx.handleEvent, {
129-
keys: ["tab"]
130-
})
131-
_delegate(n13, "keyup", () => _ctx.handleEvent, {
132-
keys: ["delete"]
133-
})
134-
_delegate(n14, "keyup", () => _ctx.handleEvent, {
135-
keys: ["esc"]
136-
})
137-
_delegate(n15, "keyup", () => _ctx.handleEvent, {
138-
keys: ["space"]
139-
})
140-
_delegate(n16, "keyup", () => _ctx.handleEvent, {
141-
keys: ["up"]
142-
})
143-
_delegate(n17, "keyup", () => _ctx.handleEvent, {
144-
keys: ["down"]
145-
})
146-
_delegate(n18, "keyup", () => _ctx.handleEvent, {
147-
keys: ["left"]
148-
})
149-
_delegate(n19, "keyup", () => _ctx.submit, {
150-
modifiers: ["middle"]
151-
})
152-
_delegate(n20, "keyup", () => _ctx.submit, {
153-
modifiers: ["middle", "self"]
154-
})
155-
_delegate(n21, "keyup", () => _ctx.handleEvent, {
156-
modifiers: ["self"],
157-
keys: ["enter"]
158-
})
105+
_delegate(n7, "contextmenu", () => _withModifiers(_ctx.handleEvent, ["right"]))
106+
_delegate(n8, "click", () => _withModifiers(_ctx.handleEvent, ["left"]))
107+
_delegate(n9, "mouseup", () => _withModifiers(_ctx.handleEvent, ["middle"]))
108+
_delegate(n10, "contextmenu", () => _withKeys(_withModifiers(_ctx.handleEvent, ["right"]), ["enter"]))
109+
_delegate(n11, "keyup", () => _withKeys(_ctx.handleEvent, ["enter"]))
110+
_delegate(n12, "keyup", () => _withKeys(_ctx.handleEvent, ["tab"]))
111+
_delegate(n13, "keyup", () => _withKeys(_ctx.handleEvent, ["delete"]))
112+
_delegate(n14, "keyup", () => _withKeys(_ctx.handleEvent, ["esc"]))
113+
_delegate(n15, "keyup", () => _withKeys(_ctx.handleEvent, ["space"]))
114+
_delegate(n16, "keyup", () => _withKeys(_ctx.handleEvent, ["up"]))
115+
_delegate(n17, "keyup", () => _withKeys(_ctx.handleEvent, ["down"]))
116+
_delegate(n18, "keyup", () => _withKeys(_ctx.handleEvent, ["left"]))
117+
_delegate(n19, "keyup", () => _withModifiers(_ctx.submit, ["middle"]))
118+
_delegate(n20, "keyup", () => _withModifiers(_ctx.submit, ["middle","self"]))
119+
_delegate(n21, "keyup", () => _withKeys(_withModifiers(_ctx.handleEvent, ["self"]), ["enter"]))
159120
return [n0, n1, n2, n3, n4, n5, n6, n7, n8, n9, n10, n11, n12, n13, n14, n15, n16, n17, n18, n19, n20, n21]
160121
}"
161122
`;
@@ -312,44 +273,40 @@ export function render(_ctx) {
312273
`;
313274
314275
exports[`v-on > should not wrap keys guard if no key modifier is present 1`] = `
315-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
276+
"import { withModifiers as _withModifiers } from 'vue';
277+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
316278
const t0 = _template("<div></div>")
317279
_delegateEvents("keyup")
318280
319281
export function render(_ctx) {
320282
const n0 = t0()
321-
_delegate(n0, "keyup", () => _ctx.test, {
322-
modifiers: ["exact"]
323-
})
283+
_delegate(n0, "keyup", () => _withModifiers(_ctx.test, ["exact"]))
324284
return n0
325285
}"
326286
`;
327287
328288
exports[`v-on > should support multiple events and modifiers options w/ prefixIdentifiers: true 1`] = `
329-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
289+
"import { withModifiers as _withModifiers, withKeys as _withKeys } from 'vue';
290+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
330291
const t0 = _template("<div></div>")
331292
_delegateEvents("click", "keyup")
332293
333294
export function render(_ctx) {
334295
const n0 = t0()
335-
_delegate(n0, "click", () => _ctx.test, {
336-
modifiers: ["stop"]
337-
})
338-
_delegate(n0, "keyup", () => _ctx.test, {
339-
keys: ["enter"]
340-
})
296+
_delegate(n0, "click", () => _withModifiers(_ctx.test, ["stop"]))
297+
_delegate(n0, "keyup", () => _withKeys(_ctx.test, ["enter"]))
341298
return n0
342299
}"
343300
`;
344301
345302
exports[`v-on > should support multiple modifiers and event options w/ prefixIdentifiers: true 1`] = `
346-
"import { on as _on, template as _template } from 'vue/vapor';
303+
"import { withModifiers as _withModifiers } from 'vue';
304+
import { on as _on, template as _template } from 'vue/vapor';
347305
const t0 = _template("<div></div>")
348306
349307
export function render(_ctx) {
350308
const n0 = t0()
351-
_on(n0, "click", () => _ctx.test, {
352-
modifiers: ["stop", "prevent"],
309+
_on(n0, "click", () => _withModifiers(_ctx.test, ["stop","prevent"]), {
353310
capture: true,
354311
once: true
355312
})
@@ -358,28 +315,27 @@ export function render(_ctx) {
358315
`;
359316
360317
exports[`v-on > should transform click.middle 1`] = `
361-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
318+
"import { withModifiers as _withModifiers } from 'vue';
319+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
362320
const t0 = _template("<div></div>")
363321
_delegateEvents("mouseup")
364322
365323
export function render(_ctx) {
366324
const n0 = t0()
367-
_delegate(n0, "mouseup", () => _ctx.test, {
368-
modifiers: ["middle"]
369-
})
325+
_delegate(n0, "mouseup", () => _withModifiers(_ctx.test, ["middle"]))
370326
return n0
371327
}"
372328
`;
373329
374330
exports[`v-on > should transform click.middle 2`] = `
375-
"import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
331+
"import { withModifiers as _withModifiers } from 'vue';
332+
import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
376333
const t0 = _template("<div></div>")
377334
378335
export function render(_ctx) {
379336
const n0 = t0()
380337
_renderEffect(() => {
381-
_on(n0, (_ctx.event) === "click" ? "mouseup" : (_ctx.event), () => _ctx.test, {
382-
modifiers: ["middle"],
338+
_on(n0, (_ctx.event) === "click" ? "mouseup" : (_ctx.event), () => _withModifiers(_ctx.test, ["middle"]), {
383339
effect: true
384340
})
385341
})
@@ -388,29 +344,27 @@ export function render(_ctx) {
388344
`;
389345
390346
exports[`v-on > should transform click.right 1`] = `
391-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
347+
"import { withModifiers as _withModifiers } from 'vue';
348+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
392349
const t0 = _template("<div></div>")
393350
_delegateEvents("contextmenu")
394351
395352
export function render(_ctx) {
396353
const n0 = t0()
397-
_delegate(n0, "contextmenu", () => _ctx.test, {
398-
modifiers: ["right"]
399-
})
354+
_delegate(n0, "contextmenu", () => _withModifiers(_ctx.test, ["right"]))
400355
return n0
401356
}"
402357
`;
403358
404359
exports[`v-on > should transform click.right 2`] = `
405-
"import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
360+
"import { withModifiers as _withModifiers, withKeys as _withKeys } from 'vue';
361+
import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
406362
const t0 = _template("<div></div>")
407363
408364
export function render(_ctx) {
409365
const n0 = t0()
410366
_renderEffect(() => {
411-
_on(n0, (_ctx.event) === "click" ? "contextmenu" : (_ctx.event), () => _ctx.test, {
412-
modifiers: ["right"],
413-
keys: ["right"],
367+
_on(n0, (_ctx.event) === "click" ? "contextmenu" : (_ctx.event), () => _withKeys(_withModifiers(_ctx.test, ["right"]), ["right"]), {
414368
effect: true
415369
})
416370
})
@@ -431,15 +385,14 @@ export function render(_ctx) {
431385
`;
432386
433387
exports[`v-on > should wrap both for dynamic key event w/ left/right modifiers 1`] = `
434-
"import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
388+
"import { withModifiers as _withModifiers, withKeys as _withKeys } from 'vue';
389+
import { renderEffect as _renderEffect, on as _on, template as _template } from 'vue/vapor';
435390
const t0 = _template("<div></div>")
436391
437392
export function render(_ctx) {
438393
const n0 = t0()
439394
_renderEffect(() => {
440-
_on(n0, _ctx.e, () => _ctx.test, {
441-
modifiers: ["left"],
442-
keys: ["left"],
395+
_on(n0, _ctx.e, () => _withKeys(_withModifiers(_ctx.test, ["left"]), ["left"]), {
443396
effect: true
444397
})
445398
})
@@ -460,30 +413,28 @@ exports[`v-on > should wrap in unref if identifier is setup-maybe-ref w/ inline:
460413
`;
461414
462415
exports[`v-on > should wrap keys guard for keyboard events or dynamic events 1`] = `
463-
"import { on as _on, template as _template } from 'vue/vapor';
416+
"import { withModifiers as _withModifiers, withKeys as _withKeys } from 'vue';
417+
import { on as _on, template as _template } from 'vue/vapor';
464418
const t0 = _template("<div></div>")
465419
466420
export function render(_ctx) {
467421
const n0 = t0()
468-
_on(n0, "keydown", () => _ctx.test, {
469-
modifiers: ["stop", "ctrl"],
470-
keys: ["a"],
422+
_on(n0, "keydown", () => _withKeys(_withModifiers(_ctx.test, ["stop","ctrl"]), ["a"]), {
471423
capture: true
472424
})
473425
return n0
474426
}"
475427
`;
476428
477429
exports[`v-on > should wrap keys guard for static key event w/ left/right modifiers 1`] = `
478-
"import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
430+
"import { withKeys as _withKeys } from 'vue';
431+
import { delegate as _delegate, delegateEvents as _delegateEvents, template as _template } from 'vue/vapor';
479432
const t0 = _template("<div></div>")
480433
_delegateEvents("keyup")
481434
482435
export function render(_ctx) {
483436
const n0 = t0()
484-
_delegate(n0, "keyup", () => _ctx.test, {
485-
keys: ["left"]
486-
})
437+
_delegate(n0, "keyup", () => _withKeys(_ctx.test, ["left"]))
487438
return n0
488439
}"
489440
`;

‎packages/compiler-vapor/__tests__/transforms/vOn.spec.ts

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -481,8 +481,7 @@ describe('v-on', () => {
481481
},
482482
])
483483
expect(code).contains(
484-
`_on(n0, "click", () => _ctx.test, {
485-
modifiers: ["stop", "prevent"],
484+
`_on(n0, "click", () => _withModifiers(_ctx.test, ["stop","prevent"]), {
486485
capture: true,
487486
once: true
488487
})`,
@@ -541,14 +540,12 @@ describe('v-on', () => {
541540

542541
expect(code).matchSnapshot()
543542
expect(code).contains(
544-
`_delegate(n0, "click", () => _ctx.test, {
545-
modifiers: ["stop"]
546-
})`,
543+
`_delegate(n0, "click", () => _withModifiers(_ctx.test, ["stop"])`,
547544
)
548545

549-
expect(code).contains(`_delegate(n0, "keyup", () => _ctx.test, {
550-
keys: ["enter"]
551-
})`)
546+
expect(code).contains(
547+
`_delegate(n0, "keyup", () => _withKeys(_ctx.test, ["enter"])`,
548+
)
552549
})
553550

554551
test('should wrap keys guard for keyboard events or dynamic events', () => {

0 commit comments

Comments
 (0)