Skip to content
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
Expand Up @@ -15,6 +15,21 @@ return { myEmit }
}"
`;

exports[`defineEmits > nested call expression 1`] = `
"
export default {
emits: ['foo', 'bar'],
setup(__props, { expose: __expose, emit: __emit }) {
__expose();

const transformed = transform(__emit);

return { transformed }
}

}"
`;

exports[`defineEmits > w/ runtime options 1`] = `
"import { defineComponent as _defineComponent } from 'vue'

Expand Down
17 changes: 17 additions & 0 deletions packages/compiler-sfc/__tests__/compileScript/defineEmits.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -210,6 +210,23 @@ const emit = defineEmits(['a', 'b'])
assertCode(content)
})

test('nested call expression', () => {
const { content } = compile(`
<script setup>
const transformed = transform(defineEmits(['foo', 'bar']));
</script>
`)

// should remove defineEmits import and call
expect(content).not.toMatch('defineEmits')

assertCode(content)
expect(content).toMatch(`const transformed = transform(__emit);`)
expect(content).toMatch(
`setup(__props, { expose: __expose, emit: __emit })`,
)
})

describe('errors', () => {
test('w/ both type and non-type args', () => {
expect(() => {
Expand Down
36 changes: 20 additions & 16 deletions packages/compiler-sfc/__tests__/compileStyle.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -211,38 +211,42 @@ color: red
expect(
compileScoped(`.div { color: red; } .div:where(:hover) { color: blue; }`),
).toMatchInlineSnapshot(`
".div[data-v-test] { color: red;
}
.div[data-v-test]:where(:hover) { color: blue;
}"`)
".div[data-v-test] { color: red;
}
.div[data-v-test]:where(:hover) { color: blue;
}"
`)

expect(
compileScoped(`.div { color: red; } .div:is(:hover) { color: blue; }`),
).toMatchInlineSnapshot(`
".div[data-v-test] { color: red;
}
.div[data-v-test]:is(:hover) { color: blue;
}"`)
".div[data-v-test] { color: red;
}
.div[data-v-test]:is(:hover) { color: blue;
}"
`)

expect(
compileScoped(
`.div { color: red; } .div:where(.foo:hover) { color: blue; }`,
),
).toMatchInlineSnapshot(`
".div[data-v-test] { color: red;
}
.div[data-v-test]:where(.foo:hover) { color: blue;
}"`)
".div[data-v-test] { color: red;
}
.div[data-v-test]:where(.foo:hover) { color: blue;
}"
`)

expect(
compileScoped(
`.div { color: red; } .div:is(.foo:hover) { color: blue; }`,
),
).toMatchInlineSnapshot(`
".div[data-v-test] { color: red;
}
.div[data-v-test]:is(.foo:hover) { color: blue;
}"`)
".div[data-v-test] { color: red;
}
.div[data-v-test]:is(.foo:hover) { color: blue;
}"
`)
})

test('media query', () => {
Expand Down
10 changes: 4 additions & 6 deletions packages/compiler-sfc/src/compileScript.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,8 @@ import {
DEFINE_EMITS,
genRuntimeEmits,
processDefineEmits,
processNestedDefineEmits,
replaceDefineEmits,
} from './script/defineEmits'
import { DEFINE_EXPOSE, processDefineExpose } from './script/defineExpose'
import { DEFINE_OPTIONS, processDefineOptions } from './script/defineOptions'
Expand Down Expand Up @@ -544,7 +546,7 @@ export function compileScript(

// defineEmits
const isDefineEmits =
!isDefineProps && processDefineEmits(ctx, init, decl.id)
!isDefineProps && processNestedDefineEmits(ctx, init, decl.id)
!isDefineEmits &&
(processDefineSlots(ctx, init, decl.id) ||
processDefineModel(ctx, init, decl.id))
Expand Down Expand Up @@ -572,11 +574,7 @@ export function compileScript(
left--
}
} else if (isDefineEmits) {
ctx.s.overwrite(
startOffset + init.start!,
startOffset + init.end!,
'__emit',
)
replaceDefineEmits(ctx, init)
} else {
lastNonRemoved = i
}
Expand Down
41 changes: 41 additions & 0 deletions packages/compiler-sfc/src/script/defineEmits.ts
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,36 @@ import {

export const DEFINE_EMITS = 'defineEmits'

/**
* Detects if this node recursively contains a call to `defineEmits()`.
*
* @returns true If the given node itself is a call to `defineEmits()` and should be removed, false otherwise.
*/
export function processNestedDefineEmits(
ctx: ScriptCompileContext,
node: Node,
declId?: LVal,
): boolean {
if (node.type !== 'CallExpression') {
return false
}
if (processDefineEmits(ctx, node, declId)) {
return true
}
for (const arg of node.arguments) {
if (processNestedDefineEmits(ctx, arg, declId)) {
replaceDefineEmits(ctx, arg)
}
}

return false
}

/**
* Detects if the node is a call to `defineEmits()`.
*
* @returns true If the given node itself is a call to `defineEmits()` and should be removed, false otherwise.
*/
export function processDefineEmits(
ctx: ScriptCompileContext,
node: Node,
Expand Down Expand Up @@ -45,6 +75,17 @@ export function processDefineEmits(
return true
}

export function replaceDefineEmits(
ctx: ScriptCompileContext,
node: Node,
): void {
ctx.s.overwrite(
ctx.startOffset! + node.start!,
ctx.startOffset! + node.end!,
'__emit',
)
}

export function genRuntimeEmits(ctx: ScriptCompileContext): string | undefined {
let emitsDecl = ''
if (ctx.emitsRuntimeDecl) {
Expand Down