refactor: applyDirectives -> withDirectives

packages/compiler-core/src/ast.ts

@@ -2,7 +2,7 @@ import { isString } from '@vue/shared'
 import { ForParseResult } from './transforms/vFor'
 import {
   CREATE_VNODE,
-  APPLY_DIRECTIVES,
+  WITH_DIRECTIVES,
   RENDER_SLOT,
   CREATE_SLOTS,
   RENDER_LIST,
@@ -393,7 +393,7 @@ export interface DynamicSlotFnProperty extends Property {
 // ])
 export interface CodegenNodeWithDirective<T extends CallExpression>
   extends CallExpression {
-  callee: typeof APPLY_DIRECTIVES
+  callee: typeof WITH_DIRECTIVES
   arguments: [T, DirectiveArguments]
 }
 
@@ -548,7 +548,7 @@ type InferCodegenNodeType<T> = T extends
   | typeof CREATE_VNODE
   | typeof CREATE_BLOCK
   ? PlainElementCodegenNode | PlainComponentCodegenNode
-  : T extends typeof APPLY_DIRECTIVES
+  : T extends typeof WITH_DIRECTIVES
     ?
         | CodegenNodeWithDirective<PlainElementCodegenNode>
         | CodegenNodeWithDirective<PlainComponentCodegenNode>

packages/compiler-core/src/runtimeHelpers.ts

@@ -11,7 +11,7 @@ export const RESOLVE_DYNAMIC_COMPONENT = Symbol(
   __DEV__ ? `resolveDynamicComponent` : ``
 )
 export const RESOLVE_DIRECTIVE = Symbol(__DEV__ ? `resolveDirective` : ``)
-export const APPLY_DIRECTIVES = Symbol(__DEV__ ? `applyDirectives` : ``)
+export const WITH_DIRECTIVES = Symbol(__DEV__ ? `withDirectives` : ``)
 export const RENDER_LIST = Symbol(__DEV__ ? `renderList` : ``)
 export const RENDER_SLOT = Symbol(__DEV__ ? `renderSlot` : ``)
 export const CREATE_SLOTS = Symbol(__DEV__ ? `createSlots` : ``)
@@ -35,7 +35,7 @@ export const helperNameMap: any = {
   [RESOLVE_COMPONENT]: `resolveComponent`,
   [RESOLVE_DYNAMIC_COMPONENT]: `resolveDynamicComponent`,
   [RESOLVE_DIRECTIVE]: `resolveDirective`,
-  [APPLY_DIRECTIVES]: `applyDirectives`,
+  [WITH_DIRECTIVES]: `withDirectives`,
   [RENDER_LIST]: `renderList`,
   [RENDER_SLOT]: `renderSlot`,
   [CREATE_SLOTS]: `createSlots`,

packages/compiler-core/src/transform.ts

@@ -23,7 +23,7 @@ import {
   CREATE_VNODE,
   FRAGMENT,
   helperNameMap,
-  APPLY_DIRECTIVES,
+  WITH_DIRECTIVES,
   CREATE_BLOCK
 } from './runtimeHelpers'
 import { isVSlot, createBlockExpression } from './utils'
@@ -243,7 +243,7 @@ function finalizeRoot(root: RootNode, context: TransformContext) {
       const codegenNode = child.codegenNode as
         | ElementCodegenNode
         | ComponentCodegenNode
-      if (codegenNode.callee === APPLY_DIRECTIVES) {
+      if (codegenNode.callee === WITH_DIRECTIVES) {
         codegenNode.arguments[0].callee = helper(CREATE_BLOCK)
       } else {
         codegenNode.callee = helper(CREATE_BLOCK)

packages/compiler-core/src/transforms/hoistStatic.ts

@@ -11,7 +11,7 @@ import {
   ElementNode
 } from '../ast'
 import { TransformContext } from '../transform'
-import { APPLY_DIRECTIVES } from '../runtimeHelpers'
+import { WITH_DIRECTIVES } from '../runtimeHelpers'
 import { PatchFlags, isString, isSymbol } from '@vue/shared'
 import { isSlotOutlet, findProp } from '../utils'
 
@@ -72,7 +72,7 @@ function walk(
           !hasDynamicKeyOrRef(child)
         ) {
           let codegenNode = child.codegenNode as ElementCodegenNode
-          if (codegenNode.callee === APPLY_DIRECTIVES) {
+          if (codegenNode.callee === WITH_DIRECTIVES) {
             codegenNode = codegenNode.arguments[0]
           }
           const props = codegenNode.arguments[1]
@@ -99,7 +99,7 @@ function walk(
 
 function getPatchFlag(node: PlainElementNode): number | undefined {
   let codegenNode = node.codegenNode as ElementCodegenNode
-  if (codegenNode.callee === APPLY_DIRECTIVES) {
+  if (codegenNode.callee === WITH_DIRECTIVES) {
     codegenNode = codegenNode.arguments[0]
   }
   const flag = codegenNode.arguments[3]

packages/compiler-core/src/transforms/transformElement.ts

@@ -19,7 +19,7 @@ import { PatchFlags, PatchFlagNames, isSymbol } from '@vue/shared'
 import { createCompilerError, ErrorCodes } from '../errors'
 import {
   CREATE_VNODE,
-  APPLY_DIRECTIVES,
+  WITH_DIRECTIVES,
   RESOLVE_DIRECTIVE,
   RESOLVE_COMPONENT,
   RESOLVE_DYNAMIC_COMPONENT,
@@ -177,7 +177,7 @@ export const transformElement: NodeTransform = (node, context) => {
 
     if (runtimeDirectives && runtimeDirectives.length) {
       node.codegenNode = createCallExpression(
-        context.helper(APPLY_DIRECTIVES),
+        context.helper(WITH_DIRECTIVES),
         [
           vnode,
           createArrayExpression(

packages/compiler-core/src/transforms/vFor.ts

@@ -31,7 +31,7 @@ import {
   OPEN_BLOCK,
   CREATE_BLOCK,
   FRAGMENT,
-  APPLY_DIRECTIVES
+  WITH_DIRECTIVES
 } from '../runtimeHelpers'
 import { processExpression } from './transformExpression'
 import { PatchFlags, PatchFlagNames } from '@vue/shared'
@@ -151,7 +151,7 @@ export const transformFor = createStructuralDirectiveTransform(
         // Normal element v-for. Directly use the child's codegenNode
         // arguments, but replace createVNode() with createBlock()
         let codegenNode = node.codegenNode as ElementCodegenNode
-        if (codegenNode.callee === APPLY_DIRECTIVES) {
+        if (codegenNode.callee === WITH_DIRECTIVES) {
           codegenNode.arguments[0].callee = helper(CREATE_BLOCK)
         } else {
           codegenNode.callee = helper(CREATE_BLOCK)

packages/compiler-core/src/transforms/vIf.ts

@@ -32,7 +32,7 @@ import {
   CREATE_BLOCK,
   COMMENT,
   FRAGMENT,
-  APPLY_DIRECTIVES,
+  WITH_DIRECTIVES,
   CREATE_VNODE
 } from '../runtimeHelpers'
 import { injectProp } from '../utils'
@@ -196,7 +196,7 @@ function createChildrenCodegenNode(
       | SlotOutletCodegenNode
     let vnodeCall = childCodegen
     // Element with custom directives. Locate the actual createVNode() call.
-    if (vnodeCall.callee === APPLY_DIRECTIVES) {
+    if (vnodeCall.callee === WITH_DIRECTIVES) {
       vnodeCall = vnodeCall.arguments[0]
     }
     // Change createVNode to createBlock.