refactor: remove lodash dependency #44

Author: John60676

package.json

@@ -67,7 +67,6 @@
     "@rollup/plugin-commonjs": "^16.0.0",
     "@rollup/plugin-node-resolve": "^10.0.0",
     "@types/jest": "^26.0.15",
-    "@types/lodash": "^4.14.165",
     "@types/mockjs": "^1.0.3",
     "@typescript-eslint/eslint-plugin": "^4.8.2",
     "@typescript-eslint/parser": "^4.8.2",
@@ -87,7 +86,6 @@
     "jest": "^26.6.0",
     "jest-environment-jsdom-global": "^2.0.4",
     "lint-staged": "^10.5.2",
-    "lodash": "^4.17.20",
     "mockjs": "^1.1.0",
     "node-fetch": "^2.6.1",
     "np": "^7.0.0",

src/core/createQuery.ts

@@ -1,5 +1,4 @@
-import debounce from 'lodash/debounce';
-import throttle from 'lodash/throttle';
+import { debounce, throttle } from './utils/lodash';
 import { computed, Ref, ref } from 'vue';
 import { Config } from './config';
 import { Queries } from './useAsyncQuery';
@@ -251,9 +250,13 @@ const createQuery = <R, P extends unknown[]>(
   };
 
   const debouncedRun =
-    !isNil(debounceInterval) && debounce(_run, debounceInterval);
+    !isNil(debounceInterval) && debounce(_run, debounceInterval!);
   const throttledRun =
-    !isNil(throttleInterval) && throttle(_run, throttleInterval);
+    !isNil(throttleInterval) &&
+    throttle(_run, throttleInterval!, {
+      leading: true,
+      trailing: true,
+    });
 
   const run = (...args: P) => {
     clearAllTimer();

src/useLoadMore.ts

@@ -8,11 +8,9 @@ import {
   GLOBAL_OPTIONS_PROVIDE_KEY,
 } from './core/config';
 import useAsyncQuery, { BaseResult } from './core/useAsyncQuery';
-import get from 'lodash/get';
 import generateService from './core/utils/generateService';
-import { isFunction } from './core/utils';
 import { ServiceParams } from './core/utils/types';
-import omit from 'lodash/omit';
+import { omit, get, isFunction } from './core/utils';
 
 export interface LoadMoreResult<R, P extends unknown[], LR extends unknown[]>
   extends Omit<BaseResult<R, P>, 'queries' | 'refresh' | 'mutate'> {
@@ -151,7 +149,7 @@ function useLoadMore<R, P extends unknown[], FR, LR extends unknown[]>(
   const dataList = computed(() => {
     let list: any[] = [];
     Object.values(queries).forEach(h => {
-      const dataList = get(h.data, listKey);
+      const dataList = get(h.data!, listKey);
       if (dataList && Array.isArray(dataList)) {
         list = list.concat(dataList);
       }

src/usePagination.ts

@@ -8,8 +8,8 @@ import {
   GLOBAL_OPTIONS_PROVIDE_KEY,
 } from './core/config';
 import useAsyncQuery, { BaseResult } from './core/useAsyncQuery';
-import merge from 'lodash/merge';
-import get from 'lodash/get';
+import { merge } from './core/utils/lodash';
+import { get } from './core/utils';
 import generateService from './core/utils/generateService';
 import { IService } from './core/utils/types';
 
@@ -87,7 +87,7 @@ function usePagination<R, P extends unknown[], FR>(
     { pagination: getGlobalOptions().pagination ?? {} },
     { pagination: injectedGlobalOptions.pagination ?? {} },
     options ?? ({} as any),
-  );
+  ) as any;
 
   if (queryKey) {
     throw new Error('usePagination does not support concurrent request');
@@ -103,7 +103,7 @@ function usePagination<R, P extends unknown[], FR>(
       ],
     },
     restOptions,
-  );
+  ) as any;
 
   const { data, params, queries, run, reset, ...rest } = useAsyncQuery<
     R,
@@ -147,7 +147,7 @@ function usePagination<R, P extends unknown[], FR>(
     }
   };
 
-  const total = computed<number>(() => get(data.value, totalKey, 0));
+  const total = computed<number>(() => get(data.value!, totalKey, 0));
   const current = computed({
     get: () =>
       (params.value[0] as Record<string, number>)?.[currentKey] ??
@@ -165,7 +165,7 @@ function usePagination<R, P extends unknown[], FR>(
     },
   });
   const totalPage = computed<number>(() =>
-    get(data.value, totalPageKey, Math.ceil(total.value / pageSize.value)),
+    get(data.value!, totalPageKey, Math.ceil(total.value / pageSize.value)),
   );
 
   return {

yarn.lock

@@ -1475,11 +1475,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/lodash@^4.14.165":
-  version "4.14.168"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.168.tgz#fe24632e79b7ade3f132891afff86caa5e5ce008"
-  integrity sha512-oVfRvqHV/V6D1yifJbVRU3TMp8OT6o6BG+U9MkwuJ3U8/CsDHvalRpsxBqivn71ztOFZBTfJMvETbqHiaNSj7Q==
-
 "@types/minimist@^1.2.0":
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
@@ -5507,7 +5502,7 @@ lodash.zip@^4.2.0:
   resolved "https://registry.yarnpkg.com/lodash.zip/-/lodash.zip-4.2.0.tgz#ec6662e4896408ed4ab6c542a3990b72cc080020"
   integrity sha1-7GZi5IlkCO1KtsVCo5kLcswIACA=
 
-[email protected], lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.20, lodash@^4.17.21, lodash@^4.7.0:
+[email protected], lodash@^4.17.12, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@^4.7.0:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==