[packages/utils] Linterの警告箇所を修正

nemuvski · Jan 31, 2024 · 08ca1e0 · 08ca1e0
1 parent 7fba55d
commit 08ca1e0
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 42 deletions.
diff --git a/packages/utils/src/functions/buildPath.ts b/packages/utils/src/functions/buildPath.ts
@@ -28,9 +28,8 @@ export function buildPath(...paths: Array<string | number | null | undefined>) {
         if (isString(p)) {
           if (i === 0) {
             return p.trim().replace(/\/*$/g, '')
-          } else {
-            return p.trim().replace(/(^\/*|\/*$)/g, '')
           }
+          return p.trim().replace(/(^\/*|\/*$)/g, '')
         }
         // フォールバック
         return p

diff --git a/packages/utils/src/functions/cls.ts b/packages/utils/src/functions/cls.ts
@@ -1,7 +1,7 @@
-import { isNullish } from './isNullish'
 import { isBoolean } from './isBoolean'
-import { isString } from './isString'
+import { isNullish } from './isNullish'
 import { isNumber } from './isNumber'
+import { isString } from './isString'
 
 /**
  * cls()の引数optionsの型
@@ -58,10 +58,10 @@ export function cls(
   if (isString(value) || isNumber(value)) return options?.trimPeriod ? String(value).replace(/\.+/g, '') : String(value)
   let res = ''
   if (Array.isArray(value)) {
-    value.forEach((n) => {
+    for (const n of value) {
       const childRes = cls(n, options)
       if (childRes) res += (res && ' ') + childRes
-    })
+    }
   } else {
     for (const key in value) {
       if (value[key]) res += (res && ' ') + key

diff --git a/packages/utils/src/functions/containParamInUrl.ts b/packages/utils/src/functions/containParamInUrl.ts
@@ -1,7 +1,7 @@
-import { isString } from './isString'
+import { escapeRegExpChars } from './escapeRegExpChars'
 import { getQueryString } from './getQueryString'
+import { isString } from './isString'
 import { isURL } from './isURL'
-import { escapeRegExpChars } from './escapeRegExpChars'
 
 /**
  * 引数urlで指定したパラメータ名が存在する場合はTrueを返却
@@ -25,7 +25,7 @@ import { escapeRegExpChars } from './escapeRegExpChars'
  */
 export function containParamInUrl<P extends string>(url: string | URL | URLSearchParams, paramName: P) {
   if (isString(url)) {
-    return new RegExp('(\\?|&)' + escapeRegExpChars(paramName) + '=', 'g').test(getQueryString(url))
+    return new RegExp(`(\\?|&)${escapeRegExpChars(paramName)}=`, 'g').test(getQueryString(url))
   }
   return isURL(url) ? url.searchParams.has(paramName) : url.has(paramName)
 }
diff --git a/packages/utils/src/functions/diffArray.ts b/packages/utils/src/functions/diffArray.ts
@@ -39,24 +39,25 @@ export function diffArray<T>(
 
   if (!left.length) {
     return { leftOnlyItems, rightOnlyItems: right, bothItems }
-  } else if (!right.length) {
+  }
+  if (!right.length) {
     return { leftOnlyItems: left, rightOnlyItems, bothItems }
-  } else {
-    // 配列leftを起点に配列leftにしか無い要素、両方に存在する要素を評価する
-    for (const leftItem of left) {
-      const matchedIndex = right.findIndex((rightItem) => matchFn(leftItem, rightItem))
-      if (matchedIndex < 0) {
-        leftOnlyItems.push(leftItem)
-      } else {
-        bothItems.push(leftItem)
-      }
+  }
+
+  // 配列leftを起点に配列leftにしか無い要素、両方に存在する要素を評価する
+  for (const leftItem of left) {
+    const matchedIndex = right.findIndex((rightItem) => matchFn(leftItem, rightItem))
+    if (matchedIndex < 0) {
+      leftOnlyItems.push(leftItem)
+    } else {
+      bothItems.push(leftItem)
     }
-    // 次に、配列rightから両方に存在する要素を除いたものを求める
-    for (const rightItem of right) {
-      const matchedIndex = bothItems.findIndex((bothItem) => matchFn(rightItem, bothItem))
-      if (matchedIndex < 0) {
-        rightOnlyItems.push(rightItem)
-      }
+  }
+  // 次に、配列rightから両方に存在する要素を除いたものを求める
+  for (const rightItem of right) {
+    const matchedIndex = bothItems.findIndex((bothItem) => matchFn(rightItem, bothItem))
+    if (matchedIndex < 0) {
+      rightOnlyItems.push(rightItem)
     }
   }
   return { leftOnlyItems, rightOnlyItems, bothItems }

diff --git a/packages/utils/src/functions/getQueryParamsValue.ts b/packages/utils/src/functions/getQueryParamsValue.ts
@@ -1,7 +1,7 @@
-import { isString } from './isString'
+import { escapeRegExpChars } from './escapeRegExpChars'
 import { getQueryString } from './getQueryString'
+import { isString } from './isString'
 import { isURL } from './isURL'
-import { escapeRegExpChars } from './escapeRegExpChars'
 
 /**
  * 引数urlから指定したパラメータをキーとした配列を値に持つオブジェクトを返却
@@ -33,14 +33,14 @@ export function getQueryParamsValue<P extends string>(
     return res
   }
 
-  paramNames.forEach((f) => {
+  for (const f of paramNames) {
     res[f] = []
-  })
+  }
 
   if (isString(url)) {
     const queryStr = getQueryString(url)
     const paramNamesPattern = paramNames.map((k) => escapeRegExpChars(k)).join('|')
-    const matches = queryStr.matchAll(new RegExp('(\\?|&)(' + paramNamesPattern + ')=([^&]*)', 'g'))
+    const matches = queryStr.matchAll(new RegExp(`(\\?|&)(${paramNamesPattern})=([^&]*)`, 'g'))
     for (const m of matches) {
       // NOTE: 添字2はパラメータ名グループ, 添字3はパラメータの値グループ
       if (m[2] !== undefined && m[3] !== undefined) {
@@ -49,9 +49,9 @@ export function getQueryParamsValue<P extends string>(
     }
   } else {
     const searchParams = isURL(url) ? url.searchParams : url
-    paramNames.forEach((param) => {
+    for (const param of paramNames) {
       res[param] = searchParams.getAll(param)
-    })
+    }
   }
 
   return res

diff --git a/packages/utils/src/functions/removeControlChars.ts b/packages/utils/src/functions/removeControlChars.ts
@@ -39,5 +39,5 @@ export function removeControlChars(str: string, options?: RemoveControlCharsOpti
     if (options.lf) regexStr += '\x0A'
     if (options.cr) regexStr += '\x0D'
   }
-  return str.replace(new RegExp('[' + regexStr + ']', 'g'), '')
+  return str.replace(new RegExp(`[${regexStr}]`, 'g'), '')
 }
diff --git a/packages/utils/src/functions/removeZWChars.ts b/packages/utils/src/functions/removeZWChars.ts
@@ -41,5 +41,5 @@ export function removeZWChars(str: string, options?: RemoveZWCharsOptions) {
     if (options.rlm) regexStr += '\u200f'
     if (options.zwnbsp) regexStr += '\ufeff'
   }
-  return str.replace(new RegExp('[' + regexStr + ']', 'g'), '')
+  return str.replace(new RegExp(`[${regexStr}]`, 'g'), '')
 }
diff --git a/packages/utils/src/functions/separateArray.ts b/packages/utils/src/functions/separateArray.ts
@@ -37,14 +37,14 @@
 export function separateArray<T, M extends T, N extends T>(arr: Array<T>, matchFn: (v: T) => boolean) {
   const matches: Array<M> = []
   const notMatches: Array<N> = []
-  arr.forEach((v) => {
+  for (const v of arr) {
     if (matchFn(v)) {
       // @ts-ignore: MはTと異なる場合がある
       matches.push(v)
     } else {
       // @ts-ignore: NはTと異なる場合がある
       notMatches.push(v)
     }
-  })
+  }
   return { matches, notMatches }
 }
diff --git a/packages/utils/src/functions/strf.ts b/packages/utils/src/functions/strf.ts
@@ -39,7 +39,7 @@ import { escapeRegExpChars } from './escapeRegExpChars'
 export function strf<F extends Record<string, Primitive>>(
   str: string,
   fields: F,
-  transFn: (fieldName: keyof F, fieldValue: F[keyof F]) => string = (n, v) => String(v).toString()
+  transFn: (fieldName: keyof F, fieldValue: F[keyof F]) => string = (_n, v) => String(v).toString()
 ) {
   if (!Object.keys(fields).length) {
     return str

diff --git a/packages/utils/src/functions/withRootRelativePath.ts b/packages/utils/src/functions/withRootRelativePath.ts
@@ -11,5 +11,5 @@
  * withRootRelativePath('path/to/test')
  */
 export function withRootRelativePath(path: string) {
-  return '/' + path.trim().replace(/^\/+/, '')
+  return `/${path.trim().replace(/^\/+/, '')}`
 }
diff --git a/packages/utils/src/functions/withTrailingSlash.ts b/packages/utils/src/functions/withTrailingSlash.ts
@@ -16,5 +16,5 @@ import { removeTrailingSlash } from './removeTrailingSlash'
  * withTrailingSlash('http://localhost:8000/sample')
  */
 export function withTrailingSlash(path: string) {
-  return removeTrailingSlash(path) + '/'
+  return `${removeTrailingSlash(path)}/`
 }
diff --git a/packages/utils/tests/functions/separateArray.spec.ts b/packages/utils/tests/functions/separateArray.spec.ts
@@ -1,5 +1,5 @@
 import { describe, test, expect } from 'vitest'
-import { isNotNullish, isNumber, Nullish, separateArray } from '../../src'
+import { isNotNullish, isNumber, type Nullish, separateArray } from '../../src'
 
 describe('separateArray()', () => {
   test('separateArray() - Pattern1', () => {

diff --git a/packages/utils/tests/types/aliases.spec.ts b/packages/utils/tests/types/aliases.spec.ts
@@ -1,5 +1,5 @@
 import { expectTypeOf, describe, test } from 'vitest'
-import { Primitive, Falsy, Nullish } from '../../src'
+import type { Primitive, Falsy, Nullish } from '../../src'
 
 describe('types/aliases.ts', () => {
   const date = new Date('August 19, 1975 23:15:30')

diff --git a/packages/utils/tests/types/utils.spec.ts b/packages/utils/tests/types/utils.spec.ts
@@ -1,5 +1,5 @@
 import { expectTypeOf, describe, test } from 'vitest'
-import {
+import type {
   MatchTypeKeys,
   ExactMatchTypeKeys,
   NotMatchTypeKeys,