refactor: move formatComponentName to component.ts

Author: xiaodong2008

packages/runtime-vapor/src/component.ts

@@ -413,7 +413,6 @@ function getAttrsProxy(instance: ComponentInternalInstance): Data {
     ))
   )
 }
-
 const classifyRE = /(?:^|[-_])(\w)/g
 const classify = (str: string): string =>
   str.replace(classifyRE, c => c.toUpperCase()).replace(/[-_]/g, '')
@@ -427,7 +426,6 @@ export function getComponentName(
     : Component.name || (includeInferred && Component.__name)
 }
 
-/* istanbul ignore next */
 export function formatComponentName(
   instance: ComponentInternalInstance | null,
   Component: Component,
@@ -441,19 +439,22 @@ export function formatComponentName(
     }
   }
 
-  if (!name && instance && instance.parent) {
-    // try to infer the name based on reverse resolution
-    const inferFromRegistry = (registry: Record<string, any> | undefined) => {
-      for (const key in registry) {
-        if (registry[key] === Component) {
-          return key
-        }
-      }
-    }
-    name =
-      inferFromRegistry(instance.comps) ||
-      inferFromRegistry(instance.appContext.components)
-  }
+  // TODO registry
+  // if (!name && instance && instance.parent) {
+  //   // try to infer the name based on reverse resolution
+  //   const inferFromRegistry = (registry: Record<string, any> | undefined) => {
+  //     for (const key in registry) {
+  //       if (registry[key] === Component) {
+  //         return key
+  //       }
+  //     }
+  //   }
+  //   name =
+  //     inferFromRegistry(
+  //       instance.components ||
+  //         (instance.parent.type as ComponentOptions).components,
+  //     ) || inferFromRegistry(instance.appContext.components)
+  // }
 
   return name ? classify(name) : isRoot ? `App` : `Anonymous`
 }

packages/runtime-vapor/src/warning.ts

@@ -2,6 +2,7 @@ import {
   type Component,
   type ComponentInternalInstance,
   currentInstance,
+  formatComponentName,
 } from './component'
 import { isFunction, isString } from '@vue/shared'
 import { isRef, pauseTracking, resetTracking, toRaw } from '@vue/reactivity'
@@ -155,49 +156,3 @@ function formatProp(key: string, value: unknown, raw?: boolean): any {
     return raw ? value : [`${key}=`, value]
   }
 }
-
-export function getComponentName(
-  Component: Component,
-  includeInferred = true,
-): string | false | undefined {
-  return isFunction(Component)
-    ? Component.displayName || Component.name
-    : Component.name || (includeInferred && Component.__name)
-}
-
-export function formatComponentName(
-  instance: ComponentInternalInstance | null,
-  Component: Component,
-  isRoot = false,
-): string {
-  let name = getComponentName(Component)
-  if (!name && Component.__file) {
-    const match = Component.__file.match(/([^/\\]+)\.\w+$/)
-    if (match) {
-      name = match[1]
-    }
-  }
-
-  // TODO registry
-  // if (!name && instance && instance.parent) {
-  //   // try to infer the name based on reverse resolution
-  //   const inferFromRegistry = (registry: Record<string, any> | undefined) => {
-  //     for (const key in registry) {
-  //       if (registry[key] === Component) {
-  //         return key
-  //       }
-  //     }
-  //   }
-  //   name =
-  //     inferFromRegistry(
-  //       instance.components ||
-  //         (instance.parent.type as ComponentOptions).components,
-  //     ) || inferFromRegistry(instance.appContext.components)
-  // }
-
-  return name ? classify(name) : isRoot ? `App` : `Anonymous`
-}
-
-const classifyRE = /(?:^|[-_])(\w)/g
-const classify = (str: string): string =>
-  str.replace(classifyRE, c => c.toUpperCase()).replace(/[-_]/g, '')