refactor: tidy up

Author: Simon-He95

src/array/quickFind.ts

@@ -1,3 +1,6 @@
+import { isDef } from '../is/isDef'
+import { isUndef } from '../is/isUndef'
+
 export function quickFind(array: any[], id: string | number) {
   const indexMap = new Map()
   array.forEach((item, i) => indexMap.set(item[id], i))
@@ -17,23 +20,23 @@ class QuickFind {
 
   find(id: any) {
     const index = this.indexMap.get(id)
-    if (index === undefined)
+    if (isUndef(index))
       return undefined
     return this.array[index]
   }
 
   _update(id: any, key: any, value: any) {
-    if (key === undefined) {
+    if (isUndef(key)) {
       const index = this.indexMap.get(id)
-      if (index === undefined)
+      if (isUndef(index))
         throw new Error('当前id不存在')
       if (value[this.id] !== id)
         throw new Error('不可修改唯一id')
       this.array[index] = value
     }
     else {
       const target = this.find(id)
-      if (target === undefined)
+      if (isUndef(target))
         return
       target[key] = value
     }
@@ -42,7 +45,7 @@ class QuickFind {
 
   delete(id: any) {
     const index = this.indexMap.get(id)
-    if (index === undefined)
+    if (isUndef(index))
       return
     this.array.splice(index, 1)
     this.indexMap.delete(id)
@@ -51,17 +54,17 @@ class QuickFind {
 
   set(id: any, key: any, value?: any) {
     const index = this.indexMap.get(id)
-    if (value === undefined) {
-      if (key === undefined)
+    if (isUndef(value)) {
+      if (isUndef(key))
         return
       value = key
       key = undefined
     }
-    if (index !== undefined) {
+    if (isDef(index)) {
       return this._update(id, key, value)
     }
     else {
-      if (value[this.id] === undefined)
+      if (isUndef(value[this.id]))
         throw new Error('新增的数据必须包含唯一id')
       if (value[this.id] !== id)
         throw new Error('新增的数据id必须与当前id一致')

src/array/sortByOrder.ts

@@ -1,3 +1,5 @@
+import { isDef } from '../is/isDef'
+
 export function sortByOrder(sortArr: any[], order: string[], prop?: string) {
   if (!order)
     return sortArr
@@ -13,7 +15,7 @@ export function sortByOrder(sortArr: any[], order: string[], prop?: string) {
       sortArr.splice(index, 1)
     }
   })
-  if (insertIndex !== undefined)
+  if (isDef(insertIndex))
     result.splice(insertIndex, 0, ...sortArr)
   else result.concat(sortArr)
   return result

src/event/insertElement.ts

@@ -1,14 +1,15 @@
 import { mount } from '../utils/mount'
+import { isNull } from '../is/isNull'
 
 export function insertElement(
   parent: HTMLElement | string,
   element: HTMLElement | string,
   target?: HTMLElement | null,
 ): void {
-  mount(parent, element, (parent, element) =>
+  return mount(parent, element, (parent, element) =>
     (parent as HTMLElement).insertBefore(
       element as HTMLElement,
-      target === undefined ? (parent as HTMLElement).firstChild : target,
+      isNull(target) ? null : target || (parent as HTMLElement).firstChild,
     ),
   )
 }

src/is/isArray.ts

@@ -1,3 +1 @@
-export function isArray(o: any): o is Array<any> {
-  return Array.isArray(o)
-}
+export const isArray = Array.isArray

src/is/isBrowser.ts

@@ -1 +1,3 @@
-export const isBrowser = () => typeof window !== 'undefined'
+import { isDef } from './isDef'
+
+export const isBrowser = () => isDef(window)

src/is/isDef.ts

@@ -1,3 +1,3 @@
-export function isDef<T = any>(v: T | undefined): v is T {
+export function isDef<T = any>(v: T): v is T extends undefined ? never : T {
   return typeof v !== 'undefined'
 }

src/node/getExportBundle.ts

@@ -1,11 +1,11 @@
-import fs from 'fs'
+import fsp from 'fs/promises'
 import path from 'path'
 import process from 'process'
-export function getExportBundle(url: string) {
+export async function getExportBundle(url: string) {
   if (/[./]/.test(url))
     throw new Error('module must be a npm module')
   const pkg = path.resolve(process.cwd(), 'node_modules', url, 'package.json')
-  const { module, main } = JSON.parse(fs.readFileSync(pkg, 'utf-8'))
+  const { module, main } = JSON.parse(await fsp.readFile(pkg, 'utf-8'))
   const modulePath = path.resolve('./node_modules/vitest', module || main)
-  return fs.readFileSync(modulePath, 'utf-8')
+  return fsp.readFile(modulePath, 'utf-8')
 }

src/node/writeFile.ts

@@ -1,4 +1,4 @@
-import fs from 'fs'
+import fsp from 'fs/promises'
 import { isStr } from '../is/isStr'
 
 export function writeFile(
@@ -9,11 +9,10 @@ export function writeFile(
   if (isStr(paths))
     paths = [paths as string]
   ;(paths as string[]).forEach(async (relativepath, i) => {
-    const content = await fs.readFileSync(relativepath, encoding)
+    const content = await fsp.readFile(relativepath, encoding)
     const result = callback?.(content, i) || content
-    fs.writeFile(relativepath, result, (err) => {
-      if (err)
-        throw err
+    fsp.writeFile(relativepath, result).catch((err) => {
+      throw err
     })
   })
 }

src/object/deepClone.ts

@@ -1,21 +1,25 @@
+import { isFn } from '../is/isFn'
+import { isNull } from '../is/isNull'
+import { isObject } from '../is/isObject'
+
 const types = [Set, Map, WeakMap, WeakSet, RegExp, Date]
 const targetMap = new WeakMap()
 export function deepClone(target: any) {
   if (targetMap.has(target))
     return targetMap.get(target)
-  if (typeof target === 'function' || target === null)
+  if (isFn(target) || isNull(target))
     return target
   if (types.includes(target.constructor))
     return new target.constructor(target)
-  if (typeof target !== 'object')
+  if (!isObject(target))
     return target
   const cloneObj = Object.create(
     Object.getPrototypeOf(target),
     Object.getOwnPropertyDescriptors(target),
   )
   targetMap.set(target, cloneObj)
   for (const key of Reflect.ownKeys(target)) {
-    if (typeof target[key] === 'object')
+    if (isObject(target[key]))
       cloneObj[key] = deepClone(target[key])
     else cloneObj[key] = target[key]
   }

src/object/deepCompare.ts

@@ -28,7 +28,7 @@ export function deepCompare(
       deepCompare(value1, value2, ignoreKeys, error, errorMsg, _key)
     }
   }
-  else if (Array.isArray(comp1) && Array.isArray(comp2)) {
+  else if (isArray(comp1) && isArray(comp2)) {
     const longer = comp1.length >= comp2.length ? comp1 : comp2
     for (const key in longer) {
       const value1 = comp1[key]