ddan-js 2.1.8 → 2.1.9

package/bin/lib/modules/obj/index.js

@@ -84,6 +84,7 @@ const _merge = (target, source, options = {}) => {
     }
     return result;
 };
+// <T extends object>
 const merge = (target, source, options = {}) => {
     let result = {};
     if (target && typeof target === 'object' && !Array.isArray(target)) {

package/bin/lib/modules/time/index.js

@@ -57,7 +57,6 @@ function now() {
  * 倒计时格式
  * @param endTime 结束时间
  * @param reg 格式
- * @param def
  * @returns
  */
 const countdown = (endTime, reg = "") => {

package/bin/types/class/tracker.d.ts

@@ -1,4 +1,4 @@
-import { dd } from "../typings";
+import { xh } from "../typings";
 export declare class DTrack {
     id: string;
     /** 开始时间戳 */
@@ -41,7 +41,7 @@ export declare class DTracker {
     get list(): DTrack[];
     get size(): number;
     _endId: (id: string) => string;
-    report(cb?: dd.TAction<DTrack, number>): void;
+    report(cb?: xh.Func2<DTrack, number>): void;
 }
 declare const tracker: DTracker;
 export default tracker;

package/bin/types/index.d.ts

@@ -34,7 +34,7 @@ declare const _default: {
         exec: (func: Function, taskId?: string) => Promise<any[]>;
         debounce: typeof import("./modules/hook/debounce").default;
         throttle: typeof import("./modules/hook/throttle").default;
-        task: (param?: import("./typings").dd.TTask | undefined) => import("./class/pipeTask").default;
+        task: (param?: import("./typings").xh.Func1<any, any> | undefined) => import("./class/pipeTask").default;
         delay: (time?: number) => Promise<unknown>;
         mutex: typeof import("./modules/hook/mutex").default;
     };
@@ -90,12 +90,12 @@ declare const _default: {
         isPromise: (value: any) => boolean;
     };
     list: {
-        stepAction: <T_1>(list: T_1[], func: import("./typings").dd.TArrayFunction<T_1>, stepCount?: number) => void;
+        stepAction: <T_1>(list: T_1[], func: import("./typings").xh.Task<T_1, void>, stepCount?: number) => void;
         skip: <T_2>(list: T_2[], count: number) => T_2[];
         take: <T_3>(list: T_3[], count: number, skip?: number) => T_3[];
         distinct: <T_4>(list: T_4[]) => T_4[];
         randoms: <T_5>(list: T_5[], count?: number, repeat?: boolean) => T_5[];
-        toKV: (list: import("./typings").dd.KV<any>[], key: string, value: string) => import("./typings").dd.KV<any>;
+        toKV: (list: import("./typings").xh.KV<any>[], key: string, value: string) => import("./typings").xh.KV<any>;
         groupBy: <T_6>(list: T_6[], key: string) => Record<string, T_6[]>;
         first: <T_7>(list: T_7[]) => T_7 | undefined;
         last: <T_8>(list: T_8[]) => T_8 | undefined;

package/bin/types/modules/hook/debounce.d.ts

@@ -1,4 +1,4 @@
-import { dd } from '../../typings';
+import { dd, xh } from '../../typings';
 /**
  * 防抖 一段时间内，规定时间间隔多次执行，回调触发一次
  * @param func
@@ -6,7 +6,7 @@ import { dd } from '../../typings';
  * @param options 参数：leading 开始执行， trailing结束执行
  * @returns
  */
-declare function debounce(func: dd.TAnyFunction, wait?: number, options?: dd.IDebounceOption): {
+declare function debounce(func: xh.Callback, wait?: number, options?: dd.IDebounceOption): {
     (...debouncedArgs: any[]): any;
     cancel: () => void;
     flush: () => any;

package/bin/types/modules/hook/index.d.ts

@@ -2,14 +2,14 @@ import debounce from "./debounce";
 import throttle from "./throttle";
 import mutex from "./mutex";
 import DPipeTask from "../../class/pipeTask";
-import { dd } from "../../typings";
+import { xh } from "../../typings";
 declare const _default: {
     sleep: (time?: number) => Promise<unknown>;
     run: (task?: Function | Promise<any> | undefined, wait?: number) => Promise<any[]>;
     exec: (func: Function, taskId?: string) => Promise<any[]>;
     debounce: typeof debounce;
     throttle: typeof throttle;
-    task: (param?: dd.TTask | undefined) => DPipeTask;
+    task: (param?: xh.Func1<any, any> | undefined) => DPipeTask;
     delay: (time?: number) => Promise<unknown>;
     mutex: typeof mutex;
 };

package/bin/types/modules/hook/mutex.d.ts

@@ -1,3 +1,3 @@
-import { dd } from '../../typings';
-declare function mutex(func: dd.TAnyFunction): (...args: any[]) => Promise<false | undefined>;
+import { xh } from '../../typings';
+declare function mutex(func: xh.Callback): (...args: any[]) => Promise<false | undefined>;
 export default mutex;

package/bin/types/modules/hook/throttle.d.ts

@@ -1,4 +1,4 @@
-import { dd } from "../../typings";
+import { dd, xh } from "../../typings";
 /**
  * 节流 每个间隔内，触发一次
  * @param func
@@ -6,7 +6,7 @@ import { dd } from "../../typings";
  * @param options 参数：leading 开始执行， trailing结束执行
  * @returns
  */
-declare function throttle(func: dd.TAnyFunction, wait?: number, options?: Omit<dd.IDebounceOption, 'maxWait'>): {
+declare function throttle(func: xh.Callback, wait?: number, options?: Omit<dd.IDebounceOption, 'maxWait'>): {
     (...debouncedArgs: any[]): any;
     cancel: () => void;
     flush: () => any;

package/bin/types/modules/http/index.d.ts

@@ -1,5 +1,5 @@
 import Interceptor from "./interceptor";
-import { dd } from "../../typings";
+import { dd, xh } from "../../typings";
 export default class Http implements dd.IHttp {
     host: string;
     reqConfig: {};
@@ -32,5 +32,5 @@ export default class Http implements dd.IHttp {
      * @param {object} req
      */
     getIdFromReqUrl(req: any): any;
-    fetch(name: string, payload?: dd.KV): Promise<any>;
+    fetch(name: string, payload?: xh.KV): Promise<any>;
 }

package/bin/types/modules/list/index.d.ts

@@ -1,4 +1,4 @@
-import { dd } from "../../typings";
+import { xh } from "../../typings";
 /**
  * 分步动作
  * @param list 列表
@@ -6,7 +6,7 @@ import { dd } from "../../typings";
  * @param stepCount 每步数量
  * @returns
  */
-declare function stepAction<T>(list: T[], func: dd.TArrayFunction<T>, stepCount?: number): void;
+declare function stepAction<T>(list: T[], func: xh.Task<T>, stepCount?: number): void;
 /**
  * 跳过数据
  * @param list 列表
@@ -35,7 +35,7 @@ declare const _default: {
     take: typeof take;
     distinct: typeof distinct;
     randoms: typeof randoms;
-    toKV: (list: dd.KV<any>[], key: string, value: string) => dd.KV<any>;
+    toKV: (list: xh.KV<any>[], key: string, value: string) => xh.KV<any>;
     groupBy: <T>(list: T[], key: string) => Record<string, T[]>;
     first: <T_1>(list: T_1[]) => T_1 | undefined;
     last: <T_2>(list: T_2[]) => T_2 | undefined;

package/bin/types/typings/index.d.ts

@@ -1,9 +1,16 @@
 import DPersist from "../class/persist";
+export declare namespace xh {
+    type KV<T = any> = Record<string, T>;
+    type Callback<T extends any[] = unknown[], R = void> = (...args: T) => R;
+    type Action<T extends any[] = unknown[], R = any> = Callback<T, R>;
+    type Task<T = any, R = void> = Callback<[T[]], R>;
+    type Func<R = any> = Callback<[], R>;
+    type Func1<T = any, R = any> = Callback<[T], R>;
+    type Func2<T0 = any, T1 = any, R = any> = Callback<[T0, T1], R>;
+    type Func3<T0 = any, T1 = any, T2 = any, R = any> = Callback<[T0, T1, T2], R>;
+    type Func4<T0 = any, T1 = any, T2 = any, T3 = any, R = any> = Callback<[T0, T1, T2, T3], R>;
+}
 export declare namespace dd {
-    type TAction<T = any, T1 = any, T2 = any, T3 = any> = (...args: unknown extends T3 ? (unknown extends T2 ? (unknown extends T1 ? [T] : [T, T1]) : [T, T1, T2]) : [T, T1, T2, T3]) => void;
-    type TFunc<R = any, T = any, T1 = any, T2 = any, T3 = any> = (...args: unknown extends T3 ? (unknown extends T2 ? (unknown extends T1 ? [T] : [T, T1]) : [T, T1, T2]) : [T, T1, T2, T3]) => R;
-    type TAnyFunction<T = void> = (...args: any[]) => T;
-    type TArrayFunction<T> = (args: T[]) => void;
     type Omit<T, K> = Pick<T, Exclude<keyof T, K>>;
     /**
      * leading 开始执行
@@ -41,9 +48,6 @@ export declare namespace dd {
         fields: string[];
         storage: DStorage;
     }
-    type TTask = (arg: any) => any;
-    type KV<T = any> = Record<string, T>;
-    type Callback<T extends any[] = unknown[], R = void> = (...args: T) => R;
     interface IHttpRequest {
         url: string;
         host: string;
@@ -52,14 +56,14 @@ export declare namespace dd {
     interface IHttpApiConfig {
         [key: string]: IHttpRequestInit;
     }
-    type ResponseInterceptFunc = (arg: IHttpResponse) => any;
-    type RequestInterceptFunc = (arg: IHttpRequest) => IHttpRequest;
+    type ResponseInterceptFunc = xh.Func1<IHttpResponse>;
+    type RequestInterceptFunc = xh.Func1<IHttpRequest, IHttpRequest>;
     interface IHttpConfig {
         host?: string;
         config: IHttpApiConfig;
         handleRequest?: RequestInterceptFunc | RequestInterceptFunc[];
         handleResponse?: ResponseInterceptFunc | ResponseInterceptFunc[];
-        handleError?: (error: any) => void;
+        handleError?: xh.Func1;
     }
     interface IHttpRequestInit extends RequestInit {
         [key: string]: any;
@@ -80,7 +84,7 @@ export declare namespace dd {
     }
     interface IHttpResponse {
         response: Response & Record<string, any>;
-        config?: KV;
+        config?: xh.KV;
         refetch: () => Promise<any>;
     }
     interface IMiniHttpOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ddan-js",
-  "version": "2.1.8",
+  "version": "2.1.9",
   "description": "",
   "keywords": [],
   "main": "bin/ddan-js.js",