feat(compiler): v-text transform + move dom-specific errros codes to compiler-dom

packages/compiler-dom/__tests__/transforms/vHtml.spec.ts

@@ -2,8 +2,7 @@ import {
   parse,
   transform,
   PlainElementNode,
-  CompilerOptions,
-  ErrorCodes
+  CompilerOptions
 } from '@vue/compiler-core'
 import { transformVHtml } from '../../src/transforms/vHtml'
 import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
@@ -12,6 +11,7 @@ import {
   genFlagText
 } from '../../../compiler-core/__tests__/testUtils'
 import { PatchFlags } from '@vue/shared'
+import { DOMErrorCodes } from '../../src/errors'
 
 function transformWithVHtml(template: string, options: CompilerOptions = {}) {
   const ast = parse(template)
@@ -47,7 +47,7 @@ describe('compiler: v-html transform', () => {
       onError
     })
     expect(onError.mock.calls).toMatchObject([
-      [{ code: ErrorCodes.X_V_HTML_WITH_CHILDREN }]
+      [{ code: DOMErrorCodes.X_V_HTML_WITH_CHILDREN }]
     ])
     expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
       arguments: [
@@ -68,7 +68,7 @@ describe('compiler: v-html transform', () => {
       onError
     })
     expect(onError.mock.calls).toMatchObject([
-      [{ code: ErrorCodes.X_V_HTML_NO_EXPRESSION }]
+      [{ code: DOMErrorCodes.X_V_HTML_NO_EXPRESSION }]
     ])
   })
 })

packages/compiler-dom/__tests__/transforms/vText.spec.ts

@@ -0,0 +1,74 @@
+import {
+  parse,
+  transform,
+  PlainElementNode,
+  CompilerOptions
+} from '@vue/compiler-core'
+import { transformVText } from '../../src/transforms/vText'
+import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
+import {
+  createObjectMatcher,
+  genFlagText
+} from '../../../compiler-core/__tests__/testUtils'
+import { PatchFlags } from '@vue/shared'
+import { DOMErrorCodes } from '../../src/errors'
+
+function transformWithVText(template: string, options: CompilerOptions = {}) {
+  const ast = parse(template)
+  transform(ast, {
+    nodeTransforms: [transformElement],
+    directiveTransforms: {
+      text: transformVText
+    },
+    ...options
+  })
+  return ast
+}
+
+describe('compiler: v-text transform', () => {
+  it('should convert v-text to textContent', () => {
+    const ast = transformWithVText(`<div v-text="test"/>`)
+    expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
+      arguments: [
+        `"div"`,
+        createObjectMatcher({
+          textContent: `[test]`
+        }),
+        `null`,
+        genFlagText(PatchFlags.PROPS),
+        `["textContent"]`
+      ]
+    })
+  })
+
+  it('should raise error and ignore children when v-text is present', () => {
+    const onError = jest.fn()
+    const ast = transformWithVText(`<div v-text="test">hello</div>`, {
+      onError
+    })
+    expect(onError.mock.calls).toMatchObject([
+      [{ code: DOMErrorCodes.X_V_TEXT_WITH_CHILDREN }]
+    ])
+    expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
+      arguments: [
+        `"div"`,
+        createObjectMatcher({
+          textContent: `[test]`
+        }),
+        `null`, // <-- children should have been removed
+        genFlagText(PatchFlags.PROPS),
+        `["textContent"]`
+      ]
+    })
+  })
+
+  it('should raise error if has no expression', () => {
+    const onError = jest.fn()
+    transformWithVText(`<div v-text></div>`, {
+      onError
+    })
+    expect(onError.mock.calls).toMatchObject([
+      [{ code: DOMErrorCodes.X_V_TEXT_NO_EXPRESSION }]
+    ])
+  })
+})

packages/compiler-dom/src/errors.ts

@@ -0,0 +1,35 @@
+import {
+  SourceLocation,
+  CompilerError,
+  createCompilerError,
+  ErrorCodes
+} from '@vue/compiler-core'
+
+export interface DOMCompilerError extends CompilerError {
+  code: DOMErrorCodes
+}
+
+export function createDOMCompilerError(
+  code: DOMErrorCodes,
+  loc?: SourceLocation
+): DOMCompilerError {
+  return createCompilerError(
+    code,
+    loc,
+    __DEV__ || !__BROWSER__ ? DOMErrorMessages : undefined
+  )
+}
+
+export const enum DOMErrorCodes {
+  X_V_HTML_NO_EXPRESSION = ErrorCodes.__EXTEND_POINT__,
+  X_V_HTML_WITH_CHILDREN,
+  X_V_TEXT_NO_EXPRESSION,
+  X_V_TEXT_WITH_CHILDREN
+}
+
+export const DOMErrorMessages: { [code: number]: string } = {
+  [DOMErrorCodes.X_V_HTML_NO_EXPRESSION]: `v-html is missing expression.`,
+  [DOMErrorCodes.X_V_HTML_WITH_CHILDREN]: `v-html will override element children.`,
+  [DOMErrorCodes.X_V_TEXT_NO_EXPRESSION]: `v-text is missing expression.`,
+  [DOMErrorCodes.X_V_TEXT_WITH_CHILDREN]: `v-text will override element children.`
+}

packages/compiler-dom/src/transforms/vHtml.ts

@@ -1,18 +1,21 @@
 import {
   DirectiveTransform,
-  createCompilerError,
-  ErrorCodes,
   createObjectProperty,
   createSimpleExpression
 } from '@vue/compiler-core'
+import { createDOMCompilerError, DOMErrorCodes } from '../errors'
 
 export const transformVHtml: DirectiveTransform = (dir, node, context) => {
   const { exp, loc } = dir
   if (!exp) {
-    context.onError(createCompilerError(ErrorCodes.X_V_HTML_NO_EXPRESSION, loc))
+    context.onError(
+      createDOMCompilerError(DOMErrorCodes.X_V_HTML_NO_EXPRESSION, loc)
+    )
   }
   if (node.children.length) {
-    context.onError(createCompilerError(ErrorCodes.X_V_HTML_WITH_CHILDREN, loc))
+    context.onError(
+      createDOMCompilerError(DOMErrorCodes.X_V_HTML_WITH_CHILDREN, loc)
+    )
     node.children.length = 0
   }
   return {

packages/compiler-dom/src/transforms/vText.ts

@@ -1 +1,28 @@
-// TODO
+import {
+  DirectiveTransform,
+  createObjectProperty,
+  createSimpleExpression
+} from '@vue/compiler-core'
+import { createDOMCompilerError, DOMErrorCodes } from '../errors'
+
+export const transformVText: DirectiveTransform = (dir, node, context) => {
+  const { exp, loc } = dir
+  if (!exp) {
+    context.onError(
+      createDOMCompilerError(DOMErrorCodes.X_V_TEXT_NO_EXPRESSION, loc)
+    )
+  }
+  if (node.children.length) {
+    context.onError(
+      createDOMCompilerError(DOMErrorCodes.X_V_TEXT_WITH_CHILDREN, loc)
+    )
+    node.children.length = 0
+  }
+  return {
+    props: createObjectProperty(
+      createSimpleExpression(`textContent`, true, loc),
+      exp || createSimpleExpression('', true)
+    ),
+    needRuntime: false
+  }
+}