@fe-free/tool 6.0.21 → 6.0.22

package/CHANGELOG.md

@@ -1,5 +1,7 @@
 # @fe-free/tool
 
+## 6.0.22
+
 ## 6.0.21
 
 ### Patch Changes

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fe-free/tool",
-  "version": "6.0.21",
+  "version": "6.0.22",
   "description": "",
   "license": "ISC",
   "author": "",

package/src/copy.ts

@@ -1,4 +1,4 @@
-async function copyToClipboard(text) {
+async function copyToClipboard(text: string): Promise<void> {
   // 优先尝试 navigator.clipboard
   if (navigator.clipboard && window.isSecureContext) {
     await navigator.clipboard.writeText(text);

package/src/environment.ts

@@ -1,4 +1,4 @@
-function getUserAgent() {
+function getUserAgent(): string {
   if (typeof window === 'undefined') {
     return '';
   }
@@ -7,22 +7,22 @@ function getUserAgent() {
 }
 
 const Environment = {
-  isWxWork: () => {
+  isWxWork: (): boolean => {
     return getUserAgent().includes('wxwork');
   },
-  isWx: () => {
+  isWx: (): boolean => {
     return getUserAgent().includes('micromessenger');
   },
-  isH5: () => {
+  isH5: (): boolean => {
     return getUserAgent().includes('mobile');
   },
-  isDingTalk: () => {
+  isDingTalk: (): boolean => {
     return getUserAgent().includes('dingtalk');
   },
-  isAndroid: () => {
+  isAndroid: (): boolean => {
     return getUserAgent().includes('android');
   },
-  isIOS: () => {
+  isIOS: (): boolean => {
     return getUserAgent().includes('iphone') || getUserAgent().includes('ipad');
   },
 };

package/src/pinyin/filter.ts

@@ -1,18 +1,28 @@
-import { filter, isString, map } from 'lodash-es';
+import { isString, map } from 'lodash-es';
+
 import { pinyin } from './pinyin';
 
-const defaultWhat = (v) => v;
+function defaultWhat(value: string): string {
+  return value;
+}
 /**  字符串匹配，中文首字母拼音匹配，字母小写匹配 */
-function pinyinFilter<T>(list: T[], filterText: string, what: (v: T) => string = defaultWhat) {
+function pinyinFilter(list: string[], filterText: string): string[];
+function pinyinFilter<T>(list: T[], filterText: string, what: (v: T) => string): T[];
+function pinyinFilter<T>(
+  list: T[] | string[],
+  filterText: string,
+  what?: ((v: T) => string) | ((v: string) => string),
+): T[] | string[] {
   if (!filterText) {
     return list || [];
   }
 
-  filterText = filterText.toLowerCase();
+  const loweredFilterText = filterText.toLowerCase();
+  const getValue = (what ?? defaultWhat) as (value: T | string) => string;
 
-  return filter(list, (v) => {
-    return pinyinMatch(what(v), filterText);
-  });
+  return list.filter((v) => {
+    return pinyinMatch(getValue(v), loweredFilterText);
+  }) as T[] | string[];
 }
 
 function pinyinMatch(value: string, filterText: string) {
@@ -23,9 +33,9 @@ function pinyinMatch(value: string, filterText: string) {
   }
   w = w.toLowerCase();
   // 全拼集合
-  const normal = map(pinyin(w), (value) => value[0]).join('');
+  const normal = map(pinyin(w), (v) => v[0]).join('');
   // 首字母集合
-  const firstLetter = map(pinyin(w, 'first_letter'), (value) => value[0]).join('');
+  const firstLetter = map(pinyin(w, 'first_letter'), (v) => v[0]).join('');
 
   return (
     w.indexOf(filterText) > -1 ||
@@ -42,7 +52,7 @@ function pinyinMatchWithoutFirstLetter(value: string, filterText: string) {
   }
   w = w.toLowerCase();
   // 全拼集合
-  const normal = map(pinyin(w), (value) => value[0]).join('');
+  const normal = map(pinyin(w), (v) => v[0]).join('');
 
   return w.indexOf(filterText) > -1 || normal.indexOf(filterText) > -1;
 }
@@ -55,7 +65,7 @@ function pinyinMatchWithoutFullLetter(value: string, filterText: string) {
   }
   w = w.toLowerCase();
   // 全拼集合
-  const firstLetter = map(pinyin(w, 'first_letter'), (value) => value[0]).join('');
+  const firstLetter = map(pinyin(w, 'first_letter'), (v) => v[0]).join('');
 
   return w.indexOf(filterText) > -1 || firstLetter.indexOf(filterText) > -1;
 }

package/src/pinyin/pinyin.ts

@@ -1,7 +1,11 @@
 import { forEach } from 'lodash-es';
 
-let instance;
-const pinyin = (source: string, style?: 'first_letter') => {
+type PinyinStyle = 'first_letter';
+type PinyinTransform = (source: string, style?: PinyinStyle) => string;
+
+let instance: PinyinTransform | undefined;
+
+const pinyin = (source: string, style?: PinyinStyle): string => {
   if (instance) {
     return instance(source, style);
   }
@@ -667,7 +671,7 @@ const pinyin = (source: string, style?: 'first_letter') => {
   const firstHanziCharCode = 19968; // 0x4e00
   const lastHanziCharCode = 40869; // 0x9FA5
 
-  const convert = (target, style) => {
+  const convert = (target: string, style?: PinyinStyle): string => {
     const charCode = target.charCodeAt(0);
     // 不在比对范围内
     if (charCode < firstHanziCharCode || charCode > lastHanziCharCode) {
@@ -702,12 +706,7 @@ const pinyin = (source: string, style?: 'first_letter') => {
     return style === 'first_letter' ? pinyins[index].charAt(0) : pinyins[index];
   };
 
-  const _pinyin = (source, style) => {
-    // 非字符
-    if (typeof source !== 'string') {
-      return source;
-    }
-
+  const _pinyin: PinyinTransform = (source, style) => {
     let foundPinyin = '';
 
     forEach(source, (target) => {
@@ -717,11 +716,11 @@ const pinyin = (source: string, style?: 'first_letter') => {
     return foundPinyin;
   };
 
-  return ((source, style) => {
+  return ((nextSource: string, nextStyle?: PinyinStyle) => {
     if (!instance) {
       instance = _pinyin;
     }
-    return instance(source, style);
+    return instance(nextSource, nextStyle);
   })(source, style);
 };
 

package/src/sleep/index.ts

@@ -1,4 +1,4 @@
-function sleep(ms: number) {
+function sleep(ms: number): Promise<void> {
   return new Promise((resolve) => setTimeout(resolve, ms));
 }
 

package/src/url/index.ts

@@ -1,8 +1,30 @@
-type SearchParamsLike = Record<string, any> | URLSearchParams | string;
+type SearchParamPrimitive = string | number | boolean | null | undefined;
+type SearchParamsRecord = Record<string, SearchParamPrimitive>;
+type SearchParamsLike = SearchParamsRecord | URLSearchParams | string;
 
-function mergeSearchParams(l, r) {
-  const lsp = new URLSearchParams(l);
-  const rsp = new URLSearchParams(r);
+function toURLSearchParams(value: SearchParamsLike): URLSearchParams {
+  if (value instanceof URLSearchParams) {
+    return new URLSearchParams(value);
+  }
+
+  if (typeof value === 'string') {
+    return new URLSearchParams(value);
+  }
+
+  const entries = Object.entries(value).flatMap(([key, currentValue]) => {
+    if (currentValue == null) {
+      return [];
+    }
+
+    return [[key, String(currentValue)]];
+  });
+
+  return new URLSearchParams(entries);
+}
+
+function mergeSearchParams(l: SearchParamsLike, r: SearchParamsLike): URLSearchParams {
+  const lsp = toURLSearchParams(l);
+  const rsp = toURLSearchParams(r);
 
   return new URLSearchParams(`${lsp.toString()}&${rsp.toString()}`);
 }
@@ -26,7 +48,7 @@ function buildURL(url: string, options?: BuildUrlOptions) {
 
   if (hashSearchParams) {
     // 转换成 URLSearchParams
-    const hashSP = new URLSearchParams(hashSearchParams);
+    const hashSP = toURLSearchParams(hashSearchParams);
     const hash = newURL.hash;
     const index = hash.indexOf('?');
 

package/src/use_global_request.tsx

@@ -1,24 +1,29 @@
 import { useRequest } from 'ahooks';
 import type { Options, Plugin, Service } from 'ahooks/es/useRequest/src/types';
 
+type GlobalRequestOptions<TData, TParams extends any[]> = Options<TData, TParams> & {
+  __ignore?: boolean;
+};
+
 function useGlobalRequest<TData, TParams extends any[]>(
   service: Service<TData, TParams>,
   options?: Options<TData, TParams>,
   plugins?: Plugin<TData, TParams>[]
 ) {
+  const requestOptions: GlobalRequestOptions<TData, TParams> = {
+    onError: (error) => {
+      // 全局抛出错误
+      setTimeout(() => {
+        throw error;
+      }, 0);
+    },
+    ...options,
+    __ignore: true,
+  };
+
   return useRequest(
     service,
-    {
-      onError: (error) => {
-        // 全局抛出错误
-        setTimeout(() => {
-          throw error;
-        }, 0);
-      },
-      ...options,
-      // @ts-ignore
-      __ignore: true,
-    },
+    requestOptions,
     plugins
   );
 }