refactor: replace hand-rolled helpers with es-toolkit

Use isString, isNotNil, isPlainObject, and delay instead of local type guards and sleep wrappers.

Author: Innei

apps/admin/src/api/http.ts

@@ -1,3 +1,5 @@
+import { isPlainObject } from 'es-toolkit'
+
 import { API_URL } from '~/constants/env'
 import { SESSION_WITH_LOGIN } from '~/constants/keys'
 
@@ -285,13 +287,6 @@ function camelcaseKeys<T>(value: T): T {
   ) as T
 }
 
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  if (!value || typeof value !== 'object') return false
-  const prototype = Object.getPrototypeOf(value)
-
-  return prototype === Object.prototype || prototype === null
-}
-
 function toCamelCase(value: string) {
   return value.replaceAll(/_([a-z])/g, (_, letter: string) =>
     letter.toUpperCase(),

apps/admin/src/features/templates/lib/fallback-props.ts

@@ -1,3 +1,5 @@
+import { isPlainObject } from 'es-toolkit'
+
 import type { TemplateType } from '../types/templates'
 
 const sharedPostProps = {
@@ -68,15 +70,6 @@ export const templateFallbackProps: Record<
   },
 }
 
-function isPlainObject(value: unknown): value is Record<string, unknown> {
-  return (
-    value !== null &&
-    typeof value === 'object' &&
-    !Array.isArray(value) &&
-    Object.getPrototypeOf(value) === Object.prototype
-  )
-}
-
 /**
  * Recursively merge `overrides` into `base`. Arrays and primitives in `overrides`
  * replace those in `base`. Objects merge key-by-key. Used to supplement

apps/core/src/modules/ai/ai-inflight/ai-inflight.service.ts

@@ -1,9 +1,9 @@
 import { Injectable, Logger } from '@nestjs/common'
+import { delay } from 'es-toolkit'
 
 import { AppErrorCode, createAppException } from '~/common/errors'
 import { isDev } from '~/global/env.global'
 import { RedisService } from '~/processors/redis/redis.service'
-import { sleep } from '~/utils/tool.util'
 
 import type { AiInFlightOptions, AiStreamEvent } from './ai-inflight.types'
 
@@ -164,7 +164,7 @@ export class AiInFlightService {
 
     const deadline = Date.now() + lockTtlSec * 1000
     while (Date.now() < deadline) {
-      await sleep(200)
+      await delay(200)
       if (
         (await redis.set(lockKey, lockValue, 'EX', lockTtlSec, 'NX')) === 'OK'
       ) {
@@ -401,7 +401,7 @@ export class AiInFlightService {
         })
       }
 
-      await sleep(100)
+      await delay(100)
     }
   }
 }

apps/core/src/modules/ai/ai-tts/tts-runtime.adapter.ts

@@ -1,5 +1,6 @@
+import { delay } from 'es-toolkit'
+
 import { AppErrorCode, createAppException } from '~/common/errors'
-import { sleep } from '~/utils/tool.util'
 
 import { resolveTtsBaseUrl } from './tts-base-url'
 import {
@@ -60,7 +61,7 @@ export class TtsRuntimeAdapter implements ITtsRuntime {
           attempt === this.maxAttempts
         )
           break
-        await sleep(this.retryDelayMs * 2 ** (attempt - 1))
+        await delay(this.retryDelayMs * 2 ** (attempt - 1))
       }
     }
 

apps/core/src/modules/ai/runtime/pi-runtime.adapter.ts

@@ -17,6 +17,7 @@ import {
   getBuiltinModels,
 } from '@earendil-works/pi-ai/providers/all'
 import { Logger } from '@nestjs/common'
+import { isPlainObject } from 'es-toolkit/compat'
 import { jsonrepair } from 'jsonrepair'
 import { Value } from 'typebox/value'
 
@@ -211,10 +212,6 @@ function resolveVertexScope(endpoint: string | undefined): {
   }
 }
 
-function isObjectRecord(value: unknown): value is Record<string, unknown> {
-  return typeof value === 'object' && value !== null && !Array.isArray(value)
-}
-
 interface PiUsageLike {
   input?: number
   output?: number
@@ -689,7 +686,7 @@ export class PiRuntimeAdapter implements IModelRuntime {
       if (typeof args === 'string') {
         args = JSON.parse(args)
       }
-      if (!isObjectRecord(args)) {
+      if (!isPlainObject(args)) {
         throw new Error(
           'pi tool call arguments are neither an object nor JSON-parseable string',
         )
@@ -825,7 +822,7 @@ export class PiRuntimeAdapter implements IModelRuntime {
           .toolCall
         const fromEvent = evToolCall?.arguments
         let final: Record<string, unknown>
-        if (isObjectRecord(fromEvent)) {
+        if (isPlainObject(fromEvent)) {
           final = fromEvent
         } else {
           final = JSON.parse(jsonrepair(buffer)) as Record<string, unknown>

apps/core/src/modules/comment/comment.interceptor.ts

@@ -4,12 +4,12 @@ import type {
   NestInterceptor,
 } from '@nestjs/common'
 import { Injectable } from '@nestjs/common'
+import { isNotNil } from 'es-toolkit'
 import { cloneDeep, isArrayLike, isObjectLike } from 'es-toolkit/compat'
 import { map } from 'rxjs'
 
 import { getNestExecutionContextRequest } from '~/transformers/get-req.transformer'
 import { getAvatar } from '~/utils/tool.util'
-import { isDefined } from '~/utils/validator.util'
 
 @Injectable()
 export class CommentFilterEmailInterceptor implements NestInterceptor {
@@ -28,7 +28,7 @@ export class CommentFilterEmailInterceptor implements NestInterceptor {
         try {
           if (isArrayLike(data?.data)) {
             data?.data?.forEach((item: any, i: number) => {
-              if (isDefined(item.mail)) {
+              if (isNotNil(item.mail)) {
                 data.data[i].avatar = getAvatar(item.mail)
                 delete data.data[i].mail
               }

apps/core/src/modules/cron-task/cron-task.controller.ts

@@ -1,9 +1,9 @@
 import { Get, HttpCode, Param, Post } from '@nestjs/common'
+import { isString } from 'es-toolkit/compat'
 
 import { ApiController } from '~/common/decorators/api-controller.decorator'
 import { Auth } from '~/common/decorators/auth.decorator'
 import { AppErrorCode, createAppException } from '~/common/errors'
-import { isString } from '~/utils/validator.util'
 
 import { CronTaskService } from './cron-task.service'
 import { CronTaskType, type CronTaskTypeValue } from './cron-task.types'

apps/core/src/modules/note/note.service.ts

@@ -4,6 +4,7 @@ import {
   Inject,
   Injectable,
 } from '@nestjs/common'
+import { isNotNil } from 'es-toolkit'
 import { debounce, omit } from 'es-toolkit/compat'
 
 import { AppErrorCode, createAppException } from '~/common/errors'
@@ -25,7 +26,6 @@ import { isLexical } from '~/utils/content.util'
 import { scheduleManager } from '~/utils/schedule.util'
 import { normalizeSlug } from '~/utils/slug.util'
 import { getLessThanNow } from '~/utils/time.util'
-import { isDefined } from '~/utils/validator.util'
 
 import { AiSlugBackfillService } from '../ai/ai-writer/ai-slug-backfill.service'
 import { CommentService } from '../comment/comment.service'
@@ -425,10 +425,10 @@ export class NoteService {
       ['title', 'text', 'mood', 'weather', 'meta', 'topicId', 'slug'] as const
     ).some((key) => {
       if (key === 'slug' && hasSlugInput) return normalizedSlug !== oldDoc.slug
-      return isDefined(data[key]) && data[key] !== oldDoc[key]
+      return isNotNil(data[key]) && data[key] !== oldDoc[key]
     })
     const hasContentChanged = ['title', 'text'].some((key) =>
-      isDefined(data[key as keyof NoteModel]),
+      isNotNil(data[key as keyof NoteModel]),
     )
 
     const patch = omit(data, [...NOTE_PROTECTED_KEYS, 'slug'] as const)

apps/core/src/modules/page/page.service.ts

@@ -4,6 +4,7 @@ import {
   Inject,
   Injectable,
 } from '@nestjs/common'
+import { isNotNil } from 'es-toolkit'
 import { omit } from 'es-toolkit/compat'
 import slugify from 'slugify'
 
@@ -19,7 +20,6 @@ import { LexicalService } from '~/processors/helper/helper.lexical.service'
 import { ContentFormat } from '~/shared/types/content-format.type'
 import { isLexical } from '~/utils/content.util'
 import { scheduleManager } from '~/utils/schedule.util'
-import { isDefined } from '~/utils/validator.util'
 
 import { DraftRefType } from '../draft/draft.enum'
 import { DraftService } from '../draft/draft.service'
@@ -181,7 +181,7 @@ export class PageService {
       )
     }
 
-    if (['text', 'title', 'subtitle'].some((key) => isDefined(doc[key]))) {
+    if (['text', 'title', 'subtitle'].some((key) => isNotNil(doc[key]))) {
       doc.modifiedAt = new Date()
     }
     if (doc.slug) {

apps/core/src/modules/post/post.service.ts

@@ -4,6 +4,7 @@ import {
   OnApplicationBootstrap,
 } from '@nestjs/common'
 import { ModuleRef } from '@nestjs/core'
+import { isNotNil } from 'es-toolkit'
 import { debounce, omit } from 'es-toolkit/compat'
 import slugify from 'slugify'
 
@@ -27,7 +28,6 @@ import { ContentFormat } from '~/shared/types/content-format.type'
 import { isLexical } from '~/utils/content.util'
 import { scheduleManager } from '~/utils/schedule.util'
 import { getLessThanNow } from '~/utils/time.util'
-import { isDefined } from '~/utils/validator.util'
 
 import type { CategoryService } from '../category/category.service'
 import { CommentService } from '../comment/comment.service'
@@ -428,7 +428,7 @@ export class PostService implements OnApplicationBootstrap {
       if (!category) throw createAppException(AppErrorCode.CATEGORY_NOT_FOUND)
     }
 
-    if ([data.text, data.title, data.slug].some(isDefined)) {
+    if ([data.text, data.title, data.slug].some(isNotNil)) {
       data.modifiedAt = new Date()
     }