feat: optimising type judgement

packages/runtime-core/src/compat/compatConfig.ts

@@ -481,7 +481,7 @@ export function warnDeprecation(
   const { message, link } = deprecationData[key]
   warn(
     `(deprecation ${key}) ${
-      typeof message === 'function' ? message(...args) : message
+      isFunction(message) ? message(...args) : message
     }${link ? `\n  Details: ${link}` : ``}`,
   )
   if (!isCompatEnabled(key, instance, true)) {

packages/runtime-core/src/compat/global.ts

@@ -494,7 +494,7 @@ function installCompatMount(
       }
 
       let container: Element
-      if (typeof selectorOrEl === 'string') {
+      if (isString(selectorOrEl)) {
         // eslint-disable-next-line
         const result = document.querySelector(selectorOrEl)
         if (!result) {
@@ -512,10 +512,7 @@ function installCompatMount(
 
       let namespace: ElementNamespace
       if (container instanceof SVGElement) namespace = 'svg'
-      else if (
-        typeof MathMLElement === 'function' &&
-        container instanceof MathMLElement
-      )
+      else if (isFunction(MathMLElement) && container instanceof MathMLElement)
         namespace = 'mathml'
 
       // HMR root reload

packages/runtime-core/src/compat/renderFn.ts

@@ -129,7 +129,7 @@ export function compatH(
   }
 
   // to support v2 string component name look!up
-  if (typeof type === 'string') {
+  if (isString(type)) {
     const t = hyphenate(type)
     if (t === 'transition' || t === 'transition-group' || t === 'keep-alive') {
       // since transition and transition-group are runtime-dom-specific,

packages/runtime-core/src/compat/renderHelpers.ts

@@ -5,6 +5,7 @@ import {
   isArray,
   isObject,
   isReservedProp,
+  isString,
   normalizeClass,
 } from '@vue/shared'
 import type { ComponentInternalInstance, Data } from '../component'
@@ -170,13 +171,13 @@ export function legacyMarkOnce(tree: VNode): VNode {
 export function legacyBindDynamicKeys(props: any, values: any[]): any {
   for (let i = 0; i < values.length; i += 2) {
     const key = values[i]
-    if (typeof key === 'string' && key) {
+    if (isString(key) && key) {
       props[values[i]] = values[i + 1]
     }
   }
   return props
 }
 
 export function legacyPrependModifier(value: any, symbol: string): any {
-  return typeof value === 'string' ? symbol + value : value
+  return isString(value) ? symbol + value : value
 }

packages/runtime-core/src/componentProps.ts

@@ -631,10 +631,10 @@ function getType(ctor: Prop<any> | null): string {
   }
 
   // Avoid using regex for common cases by checking the type directly
-  if (typeof ctor === 'function') {
+  if (isFunction(ctor)) {
     // Using name property to avoid converting function to string
     return ctor.name || ''
-  } else if (typeof ctor === 'object') {
+  } else if (isObject(ctor)) {
     // Attempting to directly access constructor name if possible
     const name = ctor.constructor && ctor.constructor.name
     return name || ''

packages/runtime-core/src/components/Suspense.ts

@@ -10,7 +10,13 @@ import {
   normalizeVNode,
   openBlock,
 } from '../vnode'
-import { ShapeFlags, isArray, isFunction, toNumber } from '@vue/shared'
+import {
+  ShapeFlags,
+  isArray,
+  isFunction,
+  isNumber,
+  toNumber,
+} from '@vue/shared'
 import { type ComponentInternalInstance, handleSetupResult } from '../component'
 import type { Slots } from '../componentSlots'
 import {
@@ -501,7 +507,7 @@ function createSuspenseBoundary(
     hiddenContainer,
     deps: 0,
     pendingId: suspenseId++,
-    timeout: typeof timeout === 'number' ? timeout : -1,
+    timeout: isNumber(timeout) ? timeout : -1,
     activeBranch: null,
     pendingBranch: null,
     isInFallback: !isHydrating,

packages/runtime-core/src/customFormatter.ts

@@ -6,7 +6,16 @@ import {
   isShallow,
   toRaw,
 } from '@vue/reactivity'
-import { EMPTY_OBJ, extend, isArray, isFunction, isObject } from '@vue/shared'
+import {
+  EMPTY_OBJ,
+  extend,
+  isArray,
+  isBoolean,
+  isFunction,
+  isNumber,
+  isObject,
+  isString,
+} from '@vue/shared'
 import type { ComponentInternalInstance, ComponentOptions } from './component'
 import type { ComponentPublicInstance } from './componentPublicInstance'
 
@@ -146,11 +155,11 @@ export function initCustomFormatter(): void {
   }
 
   function formatValue(v: unknown, asRaw = true) {
-    if (typeof v === 'number') {
+    if (isNumber(v)) {
       return ['span', numberStyle, v]
-    } else if (typeof v === 'string') {
+    } else if (isString(v)) {
       return ['span', stringStyle, JSON.stringify(v)]
-    } else if (typeof v === 'boolean') {
+    } else if (isBoolean(v)) {
       return ['span', keywordStyle, v]
     } else if (isObject(v)) {
       return ['object', { object: asRaw ? toRaw(v) : v }]

packages/runtime-core/src/helpers/renderList.ts

@@ -5,7 +5,7 @@ import {
   shallowReadArray,
   toReactive,
 } from '@vue/reactivity'
-import { isArray, isObject, isString } from '@vue/shared'
+import { isArray, isNumber, isObject, isString } from '@vue/shared'
 import { warn } from '../warning'
 
 /**
@@ -82,7 +82,7 @@ export function renderList(
         cached && cached[i],
       )
     }
-  } else if (typeof source === 'number') {
+  } else if (isNumber(source)) {
     if (__DEV__ && !Number.isInteger(source)) {
       warn(`The v-for range expect an integer value but got ${source}.`)
     }

packages/runtime-core/src/vnode.ts

@@ -5,7 +5,9 @@ import {
   SlotFlags,
   extend,
   isArray,
+  isBoolean,
   isFunction,
+  isNumber,
   isObject,
   isOn,
   isString,
@@ -439,7 +441,7 @@ const normalizeRef = ({
   ref_key,
   ref_for,
 }: VNodeProps): VNodeNormalizedRefAtom | null => {
-  if (typeof ref === 'number') {
+  if (isNumber(ref)) {
     ref = '' + ref
   }
   return (
@@ -782,7 +784,7 @@ export function createCommentVNode(
 }
 
 export function normalizeVNode(child: VNodeChild): VNode {
-  if (child == null || typeof child === 'boolean') {
+  if (child == null || isBoolean(child)) {
     // empty placeholder
     return createVNode(Comment)
   } else if (isArray(child)) {
@@ -818,7 +820,7 @@ export function normalizeChildren(vnode: VNode, children: unknown): void {
     children = null
   } else if (isArray(children)) {
     type = ShapeFlags.ARRAY_CHILDREN
-  } else if (typeof children === 'object') {
+  } else if (isObject(children)) {
     if (shapeFlag & (ShapeFlags.ELEMENT | ShapeFlags.TELEPORT)) {
       // Normalize slot to plain children for plain element and Teleport
       const slot = (children as any).default

packages/runtime-core/src/warning.ts

@@ -5,7 +5,7 @@ import {
   type Data,
   formatComponentName,
 } from './component'
-import { isFunction, isString } from '@vue/shared'
+import { isBoolean, isFunction, isNumber, isString } from '@vue/shared'
 import { isRef, pauseTracking, resetTracking, toRaw } from '@vue/reactivity'
 import { ErrorCodes, callWithErrorHandling } from './errorHandling'
 
@@ -149,11 +149,7 @@ function formatProp(key: string, value: unknown, raw?: boolean): any {
   if (isString(value)) {
     value = JSON.stringify(value)
     return raw ? value : [`${key}=${value}`]
-  } else if (
-    typeof value === 'number' ||
-    typeof value === 'boolean' ||
-    value == null
-  ) {
+  } else if (isNumber(value) || isBoolean(value) || value == null) {
     return raw ? value : [`${key}=${value}`]
   } else if (isRef(value)) {
     value = formatProp(key, toRaw(value.value), true)
@@ -173,7 +169,7 @@ export function assertNumber(val: unknown, type: string): void {
   if (!__DEV__) return
   if (val === undefined) {
     return
-  } else if (typeof val !== 'number') {
+  } else if (!isNumber(val)) {
     warn(`${type} is not a valid number - ` + `got ${JSON.stringify(val)}.`)
   } else if (isNaN(val)) {
     warn(`${type} is NaN - ` + 'the duration expression might be incorrect.')

packages/runtime-dom/src/apiCustomElement.ts

@@ -38,7 +38,9 @@ import {
   hasOwn,
   hyphenate,
   isArray,
+  isNumber,
   isPlainObject,
+  isString,
   toNumber,
 } from '@vue/shared'
 import { createApp, createSSRApp, render } from '.'
@@ -507,7 +509,7 @@ export class VueElement
       if (shouldReflect) {
         if (val === true) {
           this.setAttribute(hyphenate(key), '')
-        } else if (typeof val === 'string' || typeof val === 'number') {
+        } else if (isString(val) || isNumber(val)) {
           this.setAttribute(hyphenate(key), val + '')
         } else if (!val) {
           this.removeAttribute(hyphenate(key))

packages/runtime-dom/src/directives/vModel.ts

@@ -11,6 +11,7 @@ import {
   invokeArrayFns,
   isArray,
   isSet,
+  isString,
   looseEqual,
   looseIndexOf,
   looseToNumber,
@@ -365,7 +366,7 @@ export function initVModelForSSR(): void {
   }
 
   vModelDynamic.getSSRProps = (binding, vnode) => {
-    if (typeof vnode.type !== 'string') {
+    if (!isString(vnode.type)) {
       return
     }
     const modelToUse = resolveDynamicModel(

packages/runtime-dom/src/index.ts

@@ -170,10 +170,7 @@ function resolveRootNamespace(
   if (container instanceof SVGElement) {
     return 'svg'
   }
-  if (
-    typeof MathMLElement === 'function' &&
-    container instanceof MathMLElement
-  ) {
+  if (isFunction(MathMLElement) && container instanceof MathMLElement) {
     return 'mathml'
   }
 }

packages/server-renderer/src/helpers/ssrRenderList.ts

@@ -1,4 +1,4 @@
-import { isArray, isObject, isString } from '@vue/shared'
+import { isArray, isNumber, isObject, isString } from '@vue/shared'
 import { warn } from '@vue/runtime-core'
 
 export function ssrRenderList(
@@ -9,7 +9,7 @@ export function ssrRenderList(
     for (let i = 0, l = source.length; i < l; i++) {
       renderItem(source[i], i)
     }
-  } else if (typeof source === 'number') {
+  } else if (isNumber(source)) {
     if (__DEV__ && !Number.isInteger(source)) {
       warn(`The v-for range expect an integer value but got ${source}.`)
       return

packages/shared/src/general.ts

@@ -49,6 +49,9 @@ export const isRegExp = (val: unknown): val is RegExp =>
 export const isFunction = (val: unknown): val is Function =>
   typeof val === 'function'
 export const isString = (val: unknown): val is string => typeof val === 'string'
+export const isNumber = (val: unknown): val is number => typeof val === 'number'
+export const isBoolean = (val: unknown): val is boolean =>
+  typeof val === 'boolean'
 export const isSymbol = (val: unknown): val is symbol => typeof val === 'symbol'
 export const isObject = (val: unknown): val is Record<any, any> =>
   val !== null && typeof val === 'object'
@@ -213,7 +216,7 @@ export function genCacheKey(source: string, options: any): string {
   return (
     source +
     JSON.stringify(options, (_, val) =>
-      typeof val === 'function' ? val.toString() : val,
+      isFunction(val) ? val.toString() : val,
     )
   )
 }

packages/shared/src/normalizeProp.ts

@@ -1,4 +1,4 @@
-import { hyphenate, isArray, isObject, isString } from './general'
+import { hyphenate, isArray, isNumber, isObject, isString } from './general'
 
 export type NormalizedStyle = Record<string, string | number>
 
@@ -51,7 +51,7 @@ export function stringifyStyle(
   }
   for (const key in styles) {
     const value = styles[key]
-    if (isString(value) || typeof value === 'number') {
+    if (isString(value) || isNumber(value)) {
       const normalizedKey = key.startsWith(`--`) ? key : hyphenate(key)
       // only render valid values
       ret += `${normalizedKey}:${value};`