From 55eb2d252ad562a34850bea1937a891fdeccb032 Mon Sep 17 00:00:00 2001
From: h_mo <596417202@qq.com>
Date: Wed, 8 Jun 2022 22:33:40 +0800
Subject: [PATCH] wip-request

---
 src/utils/http/core/defaults.ts        |  2 +-
 src/utils/http/core/dispatchRequest.ts |  3 +-
 src/utils/http/utils.ts                | 48 +++++++++++++++-----------
 3 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/src/utils/http/core/defaults.ts b/src/utils/http/core/defaults.ts
index f1db8a6..6f0e309 100644
--- a/src/utils/http/core/defaults.ts
+++ b/src/utils/http/core/defaults.ts
@@ -1,4 +1,4 @@
-import { HttpRequestConfig } from '@/utils/types/http';
+import { HttpRequestConfig } from '@/types/http';
 
 /**
  * 默认的全局配置
diff --git a/src/utils/http/core/dispatchRequest.ts b/src/utils/http/core/dispatchRequest.ts
index 524270d..81abd04 100644
--- a/src/utils/http/core/dispatchRequest.ts
+++ b/src/utils/http/core/dispatchRequest.ts
@@ -1,5 +1,6 @@
 import adapter from '../adapters';
+import { HttpRequestConfig } from '@/types/http';
 
-export default (config) => {
+export default (config: HttpRequestConfig) => {
   return adapter(config);
 };
diff --git a/src/utils/http/utils.ts b/src/utils/http/utils.ts
index 1eeea81..773d92a 100644
--- a/src/utils/http/utils.ts
+++ b/src/utils/http/utils.ts
@@ -1,19 +1,23 @@
 'use strict';
 
-import { cloneDeep } from 'lodash-es';
+import { cloneDeep, values } from 'lodash-es';
 
 // utils is a library of generic helper functions non-specific to axios
 
 const toString = Object.prototype.toString;
 
+export function is(val: unknown, type: string) {
+  return toString.call(val) === `[object ${type}]`;
+}
+
 /**
  * Determine if a value is an Array
  *
  * @param {Object} val The value to test
  * @returns {boolean} True if value is an Array, otherwise false
  */
-export function isArray(val) {
-  return toString.call(val) === '[object Array]';
+export function isArray(val: any): val is Array<any> {
+  return val && Array.isArray(val);
 }
 
 /**
@@ -22,8 +26,8 @@ export function isArray(val) {
  * @param {Object} val The value to test
  * @returns {boolean} True if value is an Object, otherwise false
  */
-export function isObject(val) {
-  return val !== null && typeof val === 'object';
+export function isObject(val: any): val is Record<any, any> {
+  return val !== null && is(val, 'Object');
 }
 
 /**
@@ -32,8 +36,8 @@ export function isObject(val) {
  * @param {Object} val The value to test
  * @returns {boolean} True if value is a Date, otherwise false
  */
-export function isDate(val) {
-  return toString.call(val) === '[object Date]';
+export function isDate(val: unknown): val is Date {
+  return is(val, 'Date');
 }
 
 /**
@@ -42,8 +46,8 @@ export function isDate(val) {
  * @param {Object} val The value to test
  * @returns {boolean} True if value is a URLSearchParams object, otherwise false
  */
-export function isURLSearchParams(val: object) {
-  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
+export function isURLSearchParams(val: unknown): val is URLSearchParams {
+  return is(val, 'URLSearchParams');
 }
 
 /**
@@ -58,7 +62,7 @@ export function isURLSearchParams(val: object) {
  * @param {Object|Array} obj The object to iterate
  * @param {Function} fn The callback to invoke for each item
  */
-export function forEach(obj, fn) {
+export function forEach(obj: any, fn: any) {
   // Don't bother if no value provided
   if (obj === null || typeof obj === 'undefined') {
     return;
@@ -66,18 +70,17 @@ export function forEach(obj, fn) {
 
   // Force an array if not already something iterable
   if (typeof obj !== 'object') {
-    /*eslint no-param-reassign:0*/
     obj = [obj];
   }
 
   if (isArray(obj)) {
     // Iterate over array values
-    for (var i = 0, l = obj.length; i < l; i++) {
-      fn.call(null, obj[i], i, obj);
-    }
+    obj.forEach((val, index, curObj) => {
+      fn.call(null, val, index, curObj);
+    });
   } else {
     // Iterate over object keys
-    for (var key in obj) {
+    for (let key in obj) {
       if (Object.prototype.hasOwnProperty.call(obj, key)) {
         fn.call(null, obj[key], key, obj);
       }
@@ -90,8 +93,8 @@ export function forEach(obj, fn) {
  * @param val
  * @returns {boolean}
  */
-export function isBoolean(val) {
-  return typeof val === 'boolean';
+export function isBoolean(val: unknown): val is boolean {
+  return is(val, 'Boolean');
 }
 
 /**
@@ -99,7 +102,7 @@ export function isBoolean(val) {
  * @param {any} obj - 检测的对象
  * @returns {boolean}
  */
-export function isPlainObject(obj) {
+export function isPlainObject(obj: object): boolean {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
 
@@ -111,12 +114,15 @@ export function isPlainObject(obj) {
  * @param {Object} obj1 Object to merge
  * @returns {Object} Result of all merge properties
  */
+
 export function deepMerge(/* obj1, obj2, obj3, ... */) {
-  let result = {};
-  function assignValue(val, key) {
+  let result: any = {};
+  function assignValue(val: any, key: any) {
     if (typeof result[key] === 'object' && typeof val === 'object') {
+      // @ts-ignore
       result[key] = deepMerge(result[key], val);
     } else if (typeof val === 'object') {
+      // @ts-ignore
       result[key] = deepMerge({}, val);
     } else {
       result[key] = val;
@@ -128,6 +134,6 @@ export function deepMerge(/* obj1, obj2, obj3, ... */) {
   return result;
 }
 
-export function isUndefined(val) {
+export function isUndefined<T = unknown>(val?: T): val is T {
   return typeof val === 'undefined';
 }