theluyuan/vue3-yuanma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor(compiler-core): use directive name in error code identifier (#163)

Browse Source
This commit is contained in:
Rahul Kadyan 2019-10-09 19:57:24 +05:30 committed by Evan You
parent 723dc8791b
commit 19c65a61ea
10 changed files with 52 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/compiler-core/__tests__/transforms/transformSlotOutlet.spec.ts
View File

@ -317,7 +317,7 @@ describe('compiler: transform <slot> outlets', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.indexOf('v-foo') const index = source.indexOf('v-foo')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET, code: ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
loc: { loc: {
source: `v-foo`, source: `v-foo`,
start: { start: {

10
packages/compiler-core/__tests__/transforms/vFor.spec.ts
View File

@ -219,7 +219,7 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_FOR_NO_EXPRESSION code: ErrorCodes.X_V_FOR_NO_EXPRESSION
}) })
) )
}) })
@ -231,7 +231,7 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION
}) })
) )
}) })
@ -243,7 +243,7 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION
}) })
) )
}) })
@ -255,7 +255,7 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION
}) })
) )
}) })
@ -267,7 +267,7 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION
}) })
) )
}) })

12
packages/compiler-core/__tests__/transforms/vIf.spec.ts
View File

@ -195,7 +195,7 @@ describe('compiler: v-if', () => {
const { node: node1 } = parseWithIfTransform(`<div v-else/>`, { onError }) const { node: node1 } = parseWithIfTransform(`<div v-else/>`, { onError })
expect(onError.mock.calls[0]).toMatchObject([ expect(onError.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node1.loc loc: node1.loc
} }
]) ])
@ -207,7 +207,7 @@ describe('compiler: v-if', () => {
) )
expect(onError.mock.calls[1]).toMatchObject([ expect(onError.mock.calls[1]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node2.loc loc: node2.loc
} }
]) ])
@ -219,7 +219,7 @@ describe('compiler: v-if', () => {
) )
expect(onError.mock.calls[2]).toMatchObject([ expect(onError.mock.calls[2]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node3.loc loc: node3.loc
} }
]) ])
@ -233,7 +233,7 @@ describe('compiler: v-if', () => {
}) })
expect(onError.mock.calls[0]).toMatchObject([ expect(onError.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node1.loc loc: node1.loc
} }
]) ])
@ -245,7 +245,7 @@ describe('compiler: v-if', () => {
) )
expect(onError.mock.calls[1]).toMatchObject([ expect(onError.mock.calls[1]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node2.loc loc: node2.loc
} }
]) ])
@ -257,7 +257,7 @@ describe('compiler: v-if', () => {
) )
expect(onError.mock.calls[2]).toMatchObject([ expect(onError.mock.calls[2]).toMatchObject([
{ {
code: ErrorCodes.X_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node3.loc loc: node3.loc
} }
]) ])

10
packages/compiler-core/__tests__/transforms/vSlot.spec.ts
View File

@ -556,7 +556,7 @@ describe('compiler: transform component slots', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.indexOf('bar') const index = source.indexOf('bar')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_EXTRANEOUS_NON_SLOT_CHILDREN, code: ErrorCodes.X_V_SLOT_EXTRANEOUS_NON_SLOT_CHILDREN,
loc: { loc: {
source: `bar`, source: `bar`,
start: { start: {
@ -579,7 +579,7 @@ describe('compiler: transform component slots', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.lastIndexOf('#foo') const index = source.lastIndexOf('#foo')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_DUPLICATE_SLOT_NAMES, code: ErrorCodes.X_V_SLOT_DUPLICATE_SLOT_NAMES,
loc: { loc: {
source: `#foo`, source: `#foo`,
start: { start: {
@ -602,7 +602,7 @@ describe('compiler: transform component slots', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.lastIndexOf('#foo') const index = source.lastIndexOf('#foo')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_MIXED_SLOT_USAGE, code: ErrorCodes.X_V_SLOT_MIXED_SLOT_USAGE,
loc: { loc: {
source: `#foo`, source: `#foo`,
start: { start: {
@ -625,7 +625,7 @@ describe('compiler: transform component slots', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.indexOf('v-slot') const index = source.indexOf('v-slot')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_MISPLACED_V_SLOT, code: ErrorCodes.X_V_SLOT_MISPLACED,
loc: { loc: {
source: `v-slot`, source: `v-slot`,
start: { start: {
@ -648,7 +648,7 @@ describe('compiler: transform component slots', () => {
parseWithSlots(source, { onError }) parseWithSlots(source, { onError })
const index = source.indexOf('v-slot') const index = source.indexOf('v-slot')
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_NAMED_SLOT_ON_COMPONENT, code: ErrorCodes.X_V_SLOT_NAMED_SLOT_ON_COMPONENT,
loc: { loc: {
source: `v-slot:foo`, source: `v-slot:foo`,
start: { start: {

40
packages/compiler-core/src/errors.ts
View File

@ -62,20 +62,20 @@ export const enum ErrorCodes {
X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END, X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END,
// transform errors // transform errors
X_IF_NO_EXPRESSION, X_V_IF_NO_EXPRESSION,
X_ELSE_NO_ADJACENT_IF, X_V_ELSE_NO_ADJACENT_IF,
X_FOR_NO_EXPRESSION, X_V_FOR_NO_EXPRESSION,
X_FOR_MALFORMED_EXPRESSION, X_V_FOR_MALFORMED_EXPRESSION,
X_V_BIND_NO_EXPRESSION, X_V_BIND_NO_EXPRESSION,
X_V_ON_NO_EXPRESSION, X_V_ON_NO_EXPRESSION,
X_V_HTML_NO_EXPRESSION, X_V_HTML_NO_EXPRESSION,
X_V_HTML_WITH_CHILDREN, X_V_HTML_WITH_CHILDREN,
X_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET, X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
X_NAMED_SLOT_ON_COMPONENT, X_V_SLOT_NAMED_SLOT_ON_COMPONENT,
X_MIXED_SLOT_USAGE, X_V_SLOT_MIXED_SLOT_USAGE,
X_DUPLICATE_SLOT_NAMES, X_V_SLOT_DUPLICATE_SLOT_NAMES,
X_EXTRANEOUS_NON_SLOT_CHILDREN, X_V_SLOT_EXTRANEOUS_NON_SLOT_CHILDREN,
X_MISPLACED_V_SLOT, X_V_SLOT_MISPLACED,
// generic errors // generic errors
X_PREFIX_ID_NOT_SUPPORTED, X_PREFIX_ID_NOT_SUPPORTED,
@ -140,27 +140,27 @@ export const errorMessages: { [code: number]: string } = {
'Note that dynamic directive argument cannot contain spaces.', 'Note that dynamic directive argument cannot contain spaces.',
// transform errors // transform errors
[ErrorCodes.X_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`, [ErrorCodes.X_V_IF_NO_EXPRESSION]: `v-if/v-else-if is missing expression.`,
[ErrorCodes.X_ELSE_NO_ADJACENT_IF]: `v-else/v-else-if has no adjacent v-if.`, [ErrorCodes.X_V_ELSE_NO_ADJACENT_IF]: `v-else/v-else-if has no adjacent v-if.`,
[ErrorCodes.X_FOR_NO_EXPRESSION]: `v-for is missing expression.`, [ErrorCodes.X_V_FOR_NO_EXPRESSION]: `v-for is missing expression.`,
[ErrorCodes.X_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`, [ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION]: `v-for has invalid expression.`,
[ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`, [ErrorCodes.X_V_BIND_NO_EXPRESSION]: `v-bind is missing expression.`,
[ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`, [ErrorCodes.X_V_ON_NO_EXPRESSION]: `v-on is missing expression.`,
[ErrorCodes.X_V_HTML_NO_EXPRESSION]: `v-html is missing epxression.`, [ErrorCodes.X_V_HTML_NO_EXPRESSION]: `v-html is missing epxression.`,
[ErrorCodes.X_V_HTML_WITH_CHILDREN]: `v-html will override element children.`, [ErrorCodes.X_V_HTML_WITH_CHILDREN]: `v-html will override element children.`,
[ErrorCodes.X_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET]: `Unexpected custom directive on <slot> outlet.`, [ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET]: `Unexpected custom directive on <slot> outlet.`,
[ErrorCodes.X_NAMED_SLOT_ON_COMPONENT]: [ErrorCodes.X_V_SLOT_NAMED_SLOT_ON_COMPONENT]:
`Named v-slot on component. ` + `Named v-slot on component. ` +
`Named slots should use <template v-slot> syntax nested inside the component.`, `Named slots should use <template v-slot> syntax nested inside the component.`,
[ErrorCodes.X_MIXED_SLOT_USAGE]: [ErrorCodes.X_V_SLOT_MIXED_SLOT_USAGE]:
`Mixed v-slot usage on both the component and nested <template>.` + `Mixed v-slot usage on both the component and nested <template>.` +
`The default slot should also use <template> syntax when there are other ` + `The default slot should also use <template> syntax when there are other ` +
`named slots to avoid scope ambiguity.`, `named slots to avoid scope ambiguity.`,
[ErrorCodes.X_DUPLICATE_SLOT_NAMES]: `Duplicate slot names found. `, [ErrorCodes.X_V_SLOT_DUPLICATE_SLOT_NAMES]: `Duplicate slot names found. `,
[ErrorCodes.X_EXTRANEOUS_NON_SLOT_CHILDREN]: [ErrorCodes.X_V_SLOT_EXTRANEOUS_NON_SLOT_CHILDREN]:
`Extraneous children found when component has explicit slots. ` + `Extraneous children found when component has explicit slots. ` +
`These children will be ignored.`, `These children will be ignored.`,
[ErrorCodes.X_MISPLACED_V_SLOT]: `v-slot can only be used on components or <template> tags.`, [ErrorCodes.X_V_SLOT_MISPLACED]: `v-slot can only be used on components or <template> tags.`,
// generic errors // generic errors
[ErrorCodes.X_PREFIX_ID_NOT_SUPPORTED]: `"prefixIdentifiers" option is not supported in this build of compiler.`, [ErrorCodes.X_PREFIX_ID_NOT_SUPPORTED]: `"prefixIdentifiers" option is not supported in this build of compiler.`,

2
packages/compiler-core/src/transforms/transformElement.ts
View File

@ -228,7 +228,7 @@ export function buildProps(
if (name === 'slot') { if (name === 'slot') {
if (!isComponent) { if (!isComponent) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_MISPLACED_V_SLOT, loc) createCompilerError(ErrorCodes.X_V_SLOT_MISPLACED, loc)
) )
} }
continue continue

2
packages/compiler-core/src/transforms/transformSlotOutlet.ts
View File

@ -59,7 +59,7 @@ export const transformSlotOutlet: NodeTransform = (node, context) => {
if (directives.length) { if (directives.length) {
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET, ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
directives[0].loc directives[0].loc
) )
) )

4
packages/compiler-core/src/transforms/vFor.ts
View File

@ -159,12 +159,12 @@ export const transformFor = createStructuralDirectiveTransform(
} }
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_FOR_MALFORMED_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION, dir.loc)
) )
} }
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_FOR_NO_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_FOR_NO_EXPRESSION, dir.loc)
) )
} }
} }

4
packages/compiler-core/src/transforms/vIf.ts
View File

@ -46,7 +46,7 @@ export const transformIf = createStructuralDirectiveTransform(
) { ) {
const loc = dir.exp ? dir.exp.loc : node.loc const loc = dir.exp ? dir.exp.loc : node.loc
context.onError( context.onError(
createCompilerError(ErrorCodes.X_IF_NO_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_IF_NO_EXPRESSION, dir.loc)
) )
dir.exp = createSimpleExpression(`true`, false, loc) dir.exp = createSimpleExpression(`true`, false, loc)
} }
@ -125,7 +125,7 @@ export const transformIf = createStructuralDirectiveTransform(
} }
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_ELSE_NO_ADJACENT_IF, node.loc) createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc)
) )
} }
break break

15
packages/compiler-core/src/transforms/vSlot.ts
View File

@ -119,7 +119,7 @@ export function buildSlots(
const { arg, exp, loc } = explicitDefaultSlot const { arg, exp, loc } = explicitDefaultSlot
if (arg) { if (arg) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_NAMED_SLOT_ON_COMPONENT, loc) createCompilerError(ErrorCodes.X_V_SLOT_NAMED_SLOT_ON_COMPONENT, loc)
) )
} }
slotsProperties.push(buildDefaultSlot(exp, children, loc)) slotsProperties.push(buildDefaultSlot(exp, children, loc))
@ -148,7 +148,7 @@ export function buildSlots(
if (explicitDefaultSlot) { if (explicitDefaultSlot) {
// already has on-component default slot - this is incorrect usage. // already has on-component default slot - this is incorrect usage.
context.onError( context.onError(
createCompilerError(ErrorCodes.X_MIXED_SLOT_USAGE, slotDir.loc) createCompilerError(ErrorCodes.X_V_SLOT_MIXED_SLOT_USAGE, slotDir.loc)
) )
break break
} }
@ -224,7 +224,7 @@ export function buildSlots(
: buildDynamicSlot(slotName, slotFunction) : buildDynamicSlot(slotName, slotFunction)
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_ELSE_NO_ADJACENT_IF, vElse.loc) createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, vElse.loc)
) )
} }
} else if ((vFor = findDir(slotElement, 'for'))) { } else if ((vFor = findDir(slotElement, 'for'))) {
@ -247,7 +247,7 @@ export function buildSlots(
) )
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_FOR_MALFORMED_EXPRESSION, vFor.loc) createCompilerError(ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION, vFor.loc)
) )
} }
} else { } else {
@ -255,7 +255,10 @@ export function buildSlots(
if (staticSlotName) { if (staticSlotName) {
if (seenSlotNames.has(staticSlotName)) { if (seenSlotNames.has(staticSlotName)) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_DUPLICATE_SLOT_NAMES, dirLoc) createCompilerError(
ErrorCodes.X_V_SLOT_DUPLICATE_SLOT_NAMES,
dirLoc
)
) )
continue continue
} }
@ -268,7 +271,7 @@ export function buildSlots(
if (hasTemplateSlots && extraneousChild) { if (hasTemplateSlots && extraneousChild) {
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_EXTRANEOUS_NON_SLOT_CHILDREN, ErrorCodes.X_V_SLOT_EXTRANEOUS_NON_SLOT_CHILDREN,
extraneousChild.loc extraneousChild.loc
) )
) )