refactor: replace inline type checks with shared utils

Author: Mini-ghost

packages/runtime-core/src/apiAsyncComponent.ts

@@ -6,7 +6,7 @@ import {
   currentInstance,
   isInSSRComponentSetup,
 } from './component'
-import { isFunction, isObject } from '@vue/shared'
+import { isFunction, isNullish, isObject } from '@vue/shared'
 import type { ComponentPublicInstance } from './componentPublicInstance'
 import { type VNode, createVNode } from './vnode'
 import { defineComponent } from './apiDefineComponent'
@@ -191,7 +191,7 @@ export function defineAsyncComponent<
         }, delay)
       }
 
-      if (timeout != null) {
+      if (!isNullish(timeout)) {
         setTimeout(() => {
           if (!loaded.value && !error.value) {
             const err = new Error(

packages/runtime-core/src/apiCreateApp.ts

@@ -22,7 +22,7 @@ import { warn } from './warning'
 import { type VNode, cloneVNode, createVNode } from './vnode'
 import type { RootHydrateFunction } from './hydration'
 import { devtoolsInitApp, devtoolsUnmountApp } from './devtools'
-import { NO, extend, isFunction, isObject } from '@vue/shared'
+import { NO, extend, isFunction, isNullish, isObject } from '@vue/shared'
 import { version } from '.'
 import { installAppCompatProperties } from './compat/global'
 import type { NormalizedPropsOptions } from './componentProps'
@@ -259,7 +259,7 @@ export function createAppAPI<HostElement>(
       rootComponent = extend({}, rootComponent)
     }
 
-    if (rootProps != null && !isObject(rootProps)) {
+    if (!isNullish(rootProps) && !isObject(rootProps)) {
       __DEV__ && warn(`root props passed to app.mount() must be an object.`)
       rootProps = null
     }

packages/runtime-core/src/apiInject.ts

@@ -1,4 +1,4 @@
-import { isFunction } from '@vue/shared'
+import { isFunction, isNullish } from '@vue/shared'
 import { currentInstance } from './component'
 import { currentRenderingInstance } from './componentRenderContext'
 import { currentApp } from './apiCreateApp'
@@ -62,7 +62,7 @@ export function inject(
     const provides = currentApp
       ? currentApp._context.provides
       : instance
-        ? instance.parent == null
+        ? isNullish(instance.parent)
           ? instance.vnode.appContext && instance.vnode.appContext.provides
           : instance.parent.provides
         : undefined

packages/runtime-core/src/component.ts

@@ -68,6 +68,7 @@ import {
   getGlobalThis,
   isArray,
   isFunction,
+  isNullish,
   isObject,
   isPromise,
   makeMap,
@@ -1127,7 +1128,7 @@ export function createSetupContext(
       if (instance.exposed) {
         warn(`expose() should be called only once per setup().`)
       }
-      if (exposed != null) {
+      if (!isNullish(exposed)) {
         let exposedType: string = typeof exposed
         if (exposedType === 'object') {
           if (isArray(exposed)) {

packages/runtime-core/src/componentOptions.ts

@@ -15,6 +15,7 @@ import {
   extend,
   isArray,
   isFunction,
+  isNullish,
   isObject,
   isPromise,
   isString,
@@ -768,7 +769,7 @@ export function applyOptions(instance: ComponentInternalInstance): void {
   if (render && instance.render === NOOP) {
     instance.render = render as InternalRenderFunction
   }
-  if (inheritAttrs != null) {
+  if (!isNullish(inheritAttrs)) {
     instance.inheritAttrs = inheritAttrs
   }
 

packages/runtime-core/src/componentProps.ts

@@ -17,6 +17,7 @@ import {
   hyphenate,
   isArray,
   isFunction,
+  isNullish,
   isObject,
   isOn,
   isReservedProp,
@@ -455,7 +456,7 @@ function resolvePropValue(
   isAbsent: boolean,
 ) {
   const opt = options[key]
-  if (opt != null) {
+  if (!isNullish(opt)) {
     const hasDefault = hasOwn(opt, 'default')
     // default values
     if (hasDefault && value === undefined) {
@@ -631,7 +632,7 @@ 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') {
@@ -657,7 +658,7 @@ function validateProps(
   const camelizePropsKey = Object.keys(rawProps).map(key => camelize(key))
   for (const key in options) {
     let opt = options[key]
-    if (opt == null) continue
+    if (isNullish(opt)) continue
     validateProp(
       key,
       resolvedValues[key],
@@ -685,11 +686,11 @@ function validateProp(
     return
   }
   // missing but optional
-  if (value == null && !required) {
+  if (isNullish(value) && !required) {
     return
   }
   // type check
-  if (type != null && type !== true && !skipCheck) {
+  if (!isNullish(type) && type !== true && !skipCheck) {
     let isValid = false
     const types = isArray(type) ? type : [type]
     const expectedTypes = []

packages/runtime-core/src/componentPublicInstance.ts

@@ -22,6 +22,7 @@ import {
   hasOwn,
   isFunction,
   isGloballyAllowed,
+  isNullish,
   isString,
 } from '@vue/shared'
 import {
@@ -596,7 +597,7 @@ export const PublicInstanceProxyHandlers: ProxyHandler<any> = {
     key: string,
     descriptor: PropertyDescriptor,
   ) {
-    if (descriptor.get != null) {
+    if (!isNullish(descriptor.get)) {
       // invalidate key cache of a getter based property #5417
       target._.accessCache![key] = 0
     } else if (hasOwn(descriptor, 'value')) {

packages/runtime-core/src/componentSlots.ts

@@ -14,6 +14,7 @@ import {
   def,
   isArray,
   isFunction,
+  isNullish,
 } from '@vue/shared'
 import { warn } from './warning'
 import { isKeepAlive } from './components/KeepAlive'
@@ -133,7 +134,7 @@ const normalizeObjectSlots = (
     const value = rawSlots[key]
     if (isFunction(value)) {
       slots[key] = normalizeSlot(key, value, ctx)
-    } else if (value != null) {
+    } else if (!isNullish(value)) {
       if (
         __DEV__ &&
         !(
@@ -248,7 +249,7 @@ export const updateSlots = (
   // delete stale slots
   if (needDeletionCheck) {
     for (const key in slots) {
-      if (!isInternalKey(key) && deletionComparisonTarget[key] == null) {
+      if (!isInternalKey(key) && isNullish(deletionComparisonTarget[key])) {
         delete slots[key]
       }
     }

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

@@ -16,7 +16,13 @@ import { warn } from '../warning'
 import { isKeepAlive } from './KeepAlive'
 import { toRaw } from '@vue/reactivity'
 import { ErrorCodes, callWithAsyncErrorHandling } from '../errorHandling'
-import { PatchFlags, ShapeFlags, isArray, isFunction } from '@vue/shared'
+import {
+  PatchFlags,
+  ShapeFlags,
+  isArray,
+  isFunction,
+  isNullish,
+} from '@vue/shared'
 import { onBeforeUnmount, onMounted } from '../apiLifecycle'
 import { isTeleport } from './Teleport'
 import type { RendererElement } from '../renderer'
@@ -545,10 +551,9 @@ export function getTransitionRawChildren(
   for (let i = 0; i < children.length; i++) {
     let child = children[i]
     // #5360 inherit parent key in case of <template v-for>
-    const key =
-      parentKey == null
-        ? child.key
-        : String(parentKey) + String(child.key != null ? child.key : i)
+    const key = isNullish(parentKey)
+      ? child.key
+      : String(parentKey) + String(!isNullish(child.key) ? child.key : i)
     // handle fragment children case, e.g. v-for
     if (child.type === Fragment) {
       if (child.patchFlag & PatchFlags.KEYED_FRAGMENT) keyedFragmentCount++
@@ -558,7 +563,7 @@ export function getTransitionRawChildren(
     }
     // comment placeholders should be skipped, e.g. v-if
     else if (keepComment || child.type !== Comment) {
-      ret.push(key != null ? cloneVNode(child, { key }) : child)
+      ret.push(!isNullish(key) ? cloneVNode(child, { key }) : child)
     }
   }
   // #1126 if a transition children list contains multiple sub fragments, these

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

@@ -28,6 +28,7 @@ import {
   ShapeFlags,
   invokeArrayFns,
   isArray,
+  isNullish,
   isRegExp,
   isString,
   remove,
@@ -237,7 +238,7 @@ const KeepAliveImpl: ComponentOptions = {
     let pendingCacheKey: CacheKey | null = null
     const cacheSubtree = () => {
       // fix #1621, the pendingCacheKey could be 0
-      if (pendingCacheKey != null) {
+      if (!isNullish(pendingCacheKey)) {
         // if KeepAlive child is a Suspense, it needs to be cached after Suspense resolves
         // avoid caching vnode that not been mounted
         if (isSuspense(instance.subTree.type)) {
@@ -321,7 +322,7 @@ const KeepAliveImpl: ComponentOptions = {
         return rawVNode
       }
 
-      const key = vnode.key == null ? comp : vnode.key
+      const key = isNullish(vnode.key) ? comp : vnode.key
       const cachedVNode = cache.get(key)
 
       // clone vnode if it's reused because we are going to mutate it

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

@@ -10,7 +10,14 @@ import {
   normalizeVNode,
   openBlock,
 } from '../vnode'
-import { ShapeFlags, isArray, isFunction, toNumber } from '@vue/shared'
+import {
+  ShapeFlags,
+  isArray,
+  isFunction,
+  isNullish,
+  isNumber,
+  toNumber,
+} from '@vue/shared'
 import { type ComponentInternalInstance, handleSetupResult } from '../component'
 import type { Slots } from '../componentSlots'
 import {
@@ -78,7 +85,7 @@ export const SuspenseImpl = {
     // platform-specific impl passed from renderer
     rendererInternals: RendererInternals,
   ): void {
-    if (n1 == null) {
+    if (isNullish(n1)) {
       mountSuspense(
         n2,
         container,
@@ -501,7 +508,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,
@@ -900,5 +907,5 @@ function setActiveBranch(suspense: SuspenseBoundary, branch: VNode) {
 
 function isVNodeSuspensible(vnode: VNode) {
   const suspensible = vnode.props && vnode.props.suspensible
-  return suspensible != null && suspensible !== false
+  return !isNullish(suspensible) && suspensible !== false
 }

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

@@ -11,7 +11,7 @@ import {
   traverseStaticChildren,
 } from '../renderer'
 import type { VNode, VNodeArrayChildren, VNodeProps } from '../vnode'
-import { ShapeFlags, isString } from '@vue/shared'
+import { ShapeFlags, isFunction, isNullish, isString } from '@vue/shared'
 import { warn } from '../warning'
 import { isHmrUpdating } from '../hmr'
 
@@ -37,7 +37,7 @@ const isTargetSVG = (target: RendererElement): boolean =>
   typeof SVGElement !== 'undefined' && target instanceof SVGElement
 
 const isTargetMathML = (target: RendererElement): boolean =>
-  typeof MathMLElement === 'function' && target instanceof MathMLElement
+  isFunction(MathMLElement) && target instanceof MathMLElement
 
 const resolveTarget = <T = RendererElement>(
   props: TeleportProps | null,
@@ -104,7 +104,7 @@ export const TeleportImpl = {
       dynamicChildren = null
     }
 
-    if (n1 == null) {
+    if (isNullish(n1)) {
       // insert anchors in the main view
       const placeholder = (n2.el = __DEV__
         ? createComment('teleport start')

packages/runtime-core/src/customFormatter.ts

@@ -8,7 +8,16 @@ import {
   resetTracking,
   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'
 
@@ -151,11 +160,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/devtools.ts

@@ -2,6 +2,7 @@
 import type { App } from './apiCreateApp'
 import { Comment, Fragment, Static, Text } from './vnode'
 import type { ComponentInternalInstance } from './component'
+import { isFunction } from '@vue/shared'
 
 interface AppRecord {
   id: number
@@ -115,7 +116,7 @@ export const devtoolsComponentRemoved = (
 ): void => {
   if (
     devtools &&
-    typeof devtools.cleanupBuffer === 'function' &&
+    isFunction(devtools.cleanupBuffer) &&
     // remove the component if it wasn't buffered
     !devtools.cleanupBuffer(component)
   ) {

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

@@ -7,7 +7,7 @@ import {
   toReactive,
   toReadonly,
 } from '@vue/reactivity'
-import { isArray, isObject, isString } from '@vue/shared'
+import { isArray, isNumber, isObject, isString } from '@vue/shared'
 import { warn } from '../warning'
 
 /**
@@ -90,7 +90,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}.`)
     }