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.

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: implement error handling for v-html #30

Merged
merged 3 commits into from
Dec 2, 2023
Merged
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 @@ -30,7 +30,21 @@ export function render(_ctx) {
}"
`;

exports[`compile > directives > v-html > no expression 1`] = `
exports[`compile > directives > v-html > should raise error and ignore children when v-html is present 1`] = `
"import { template as _template, children as _children, effect as _effect, setHtml as _setHtml } from 'vue/vapor';

export function render(_ctx) {
const t0 = _template(\\"<div></div>\\")
const n0 = t0()
const { 0: [n1],} = _children(n0)
_effect(() => {
_setHtml(n1, undefined, test)
})
return n0
}"
`;

exports[`compile > directives > v-html > should raise error if has no expression 1`] = `
"import { template as _template, children as _children, setHtml as _setHtml } from 'vue/vapor';

export function render(_ctx) {
Expand Down
28 changes: 25 additions & 3 deletions packages/compiler-vapor/__tests__/compile.test.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,9 @@
import { type RootNode, BindingTypes, ErrorCodes } from '@vue/compiler-dom'
import {
type RootNode,
BindingTypes,
ErrorCodes,
DOMErrorCodes,
} from '@vue/compiler-dom'
import { type CompilerOptions, compile as _compile } from '../src'

function compile(template: string | RootNode, options: CompilerOptions = {}) {
Expand Down Expand Up @@ -133,9 +138,26 @@ describe('compile', () => {
expect(code).matchSnapshot()
})

test('no expression', async () => {
const code = await compile(`<div v-html></div>`)
test('should raise error and ignore children when v-html is present', async () => {
const onError = vi.fn()
const code = await compile(`<div v-html="test">hello</div>`, {
onError,
})
expect(code).matchSnapshot()
expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_HTML_WITH_CHILDREN }],
])
})

test('should raise error if has no expression', async () => {
const onError = vi.fn()
const code = await compile(`<div v-html></div>`, {
onError,
})
expect(code).matchSnapshot()
expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_HTML_NO_EXPRESSION }],
])
})
})

Expand Down
14 changes: 14 additions & 0 deletions packages/compiler-vapor/src/transform.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@ import {
defaultOnWarn,
ErrorCodes,
createCompilerError,
DOMErrorCodes,
createDOMCompilerError,
} from '@vue/compiler-dom'
import { EMPTY_OBJ, NOOP, isArray, isVoidTag } from '@vue/shared'
import {
Expand Down Expand Up @@ -508,6 +510,18 @@ function transformProp(
break
}
case 'html': {
if (!exp) {
ctx.options.onError(
createDOMCompilerError(DOMErrorCodes.X_V_HTML_NO_EXPRESSION, loc),
)
}
if (ctx.node.children.length) {
ctx.options.onError(
createDOMCompilerError(DOMErrorCodes.X_V_HTML_WITH_CHILDREN, loc),
)
ctx.node.children.length = 0
}

ctx.registerEffect(
[exp],
[
Expand Down