utils-lib-js 1.0.4 → 1.0.5

package/dist/common/base.d.ts

@@ -1,5 +1,6 @@
-import { IRandomNum, IUrlSplit, IUrlJoin, IGetType, types } from "./index.js";
+import { IRandomNum, IUrlSplit, IUrlJoin, IGetType, IGetTypeByList, types } from "./index.js";
 export declare const randomNum: IRandomNum;
 export declare const urlSplit: IUrlSplit;
 export declare const urlJoin: IUrlJoin;
 export declare const getType: IGetType<types>;
+export declare const getTypeByList: IGetTypeByList;

package/dist/common/base.js

@@ -1,7 +1,7 @@
 "use strict";
 
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getType = exports.urlJoin = exports.urlSplit = exports.randomNum = void 0;
+exports.getTypeByList = exports.getType = exports.urlJoin = exports.urlSplit = exports.randomNum = void 0;
 var index_js_1 = require("./index.js");
 var randomNum = function (min, max, bool) {
     if (bool === void 0) {
@@ -24,7 +24,12 @@ var urlSplit = function (url) {
 };
 exports.urlSplit = urlSplit;
 var urlJoin = function (url, query) {
-    var params = Object.keys(query).map(function (i) {
+    if (query === void 0) {
+        query = {};
+    }
+    var queryObject = Object.keys(query);
+    if (queryObject.length === 0) return url;
+    var params = queryObject.map(function (i) {
         return "".concat(i, "=").concat(query[i]);
     });
     return "".concat(url).concat(url.includes("?") ? "&" : '?').concat(params.join("&"));
@@ -40,4 +45,12 @@ var getType = function (data) {
     }
     return type;
 };
-exports.getType = getType;
+exports.getType = getType;
+var getTypeByList = function (data, whiteList) {
+    if (whiteList === void 0) {
+        whiteList = [];
+    }
+    var __type = (0, exports.getType)(data);
+    return whiteList.indexOf(__type) > 0;
+};
+exports.getTypeByList = getTypeByList;

package/dist/common/object.d.ts

@@ -1,4 +1,4 @@
-import { IGetValue, ISetValue, IMixIn, ICloneDeep, ICreateObjectVariable, IEnumInversion, IInherit, ICreateObject, IGetInstance, IClassDecorator } from "./index.js";
+import { IGetValue, ISetValue, IMixIn, ICloneDeep, ICreateObjectVariable, IEnumInversion, IInherit, ICreateObject, IGetInstance, IClassDecorator, IStringToJson, IJsonToString } from "./index.js";
 export declare const getValue: IGetValue;
 export declare const setValue: ISetValue;
 export declare const mixIn: IMixIn;
@@ -10,3 +10,5 @@ export declare const createObject: ICreateObject;
 export declare const inherit: IInherit;
 export declare const getInstance: IGetInstance;
 export declare const classDecorator: IClassDecorator;
+export declare const stringToJson: IStringToJson;
+export declare const jsonToString: IJsonToString;

package/dist/common/object.js

@@ -10,7 +10,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.classDecorator = exports.getInstance = exports.inherit = exports.createObject = exports.createObjectVariable = exports.cloneDeep = exports.isNotObject = exports.enumInversion = exports.mixIn = exports.setValue = exports.getValue = void 0;
+exports.jsonToString = exports.stringToJson = exports.classDecorator = exports.getInstance = exports.inherit = exports.createObject = exports.createObjectVariable = exports.cloneDeep = exports.isNotObject = exports.enumInversion = exports.mixIn = exports.setValue = exports.getValue = void 0;
 var index_js_1 = require("./index.js");
 var getValue = function (object, key, defaultValue) {
     if (defaultValue === void 0) {
@@ -164,4 +164,22 @@ var classDecorator = function (params) {
         }
     };
 };
-exports.classDecorator = classDecorator;
+exports.classDecorator = classDecorator;
+var stringToJson = function (target) {
+    if ((0, index_js_1.getType)(target) !== "string") return {};
+    try {
+        return JSON.parse(target);
+    } catch (error) {
+        return {};
+    }
+};
+exports.stringToJson = stringToJson;
+var jsonToString = function (target) {
+    if (!(0, index_js_1.getTypeByList)(target, ["array", "object", "set", "map"])) return "";
+    try {
+        return JSON.stringify(target);
+    } catch (error) {
+        return "";
+    }
+};
+exports.jsonToString = jsonToString;

package/dist/common/request.d.ts

@@ -1,15 +1,42 @@
-import { IRequest } from "./index.js";
-export declare class Request implements IRequest {
+import { IRequest, IRequestBase, IInterceptors } from "./index.js";
+export declare class Interceptors implements IInterceptors {
+    private requestSuccess;
+    private responseSuccess;
+    private error;
+    use(type: any, fn: any): this;
+    get reqFn(): Function;
+    get resFn(): Function;
+    get errFn(): Function;
+}
+export declare abstract class RequestBase extends Interceptors implements IRequestBase {
     origin: string;
-    constructor();
-    fixOrigin(origin: any): this;
-    envDesc(): "Window" | "Node";
-    ajax(url: any, opts: any): void;
-    fetch(): Promise<Response>;
-    http(): void;
+    constructor(origin: any);
+    abstract fetch(url: any, opts: any): Promise<void>;
+    abstract http(url: any, opts: any): Promise<void>;
+    chackUrl: (url: any) => any;
+    fixOrigin: (fixStr: string) => string;
+    envDesc: () => "Window" | "Node";
+    requestType: () => (url: any, opts: any) => Promise<void>;
+    initFetchParams: (url: any, { method, query, headers, body, timeout, abort, type, ...others }: {
+        [x: string]: any;
+        method?: string;
+        query?: {};
+        headers?: {};
+        body?: any;
+        timeout?: number;
+        abort?: AbortController;
+        type?: string;
+    }) => any;
+    getDataByType: (type: any, response: any) => any;
+}
+export declare class Request extends RequestBase implements IRequest {
+    request: Function;
+    constructor(origin: any);
+    fetch: (_url: any, _opts: any) => Promise<void>;
+    http: (url: any, opts: any) => Promise<void>;
+    GET: (url: any, query: {}, _: any, opts: any) => any;
+    POST: (url: any, query: {}, body: any, opts: any) => any;
+    PUT: (url: any, query: {}, body: any, opts: any) => any;
+    DELETE: (url: any, query: {}, body: any, opts: any) => any;
+    OPTION: (url: any, query: {}, body: any, opts: any) => any;
 }
-export declare const GET: () => void;
-export declare const POST: () => void;
-export declare const PUT: () => void;
-export declare const DELETE: () => void;
-export declare const OPTION: () => void;

package/dist/common/request.js

@@ -1,65 +1,221 @@
 "use strict";
 
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.OPTION = exports.DELETE = exports.PUT = exports.POST = exports.GET = exports.Request = void 0;
-var index_js_1 = require("./index.js");
-var Request = function () {
-    function Request() {}
-    Request.prototype.fixOrigin = function (origin) {
-        this.origin = origin;
-        return this;
+var __extends = this && this.__extends || function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function (d, b) {
+            d.__proto__ = b;
+        } || function (d, b) {
+            for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
+        };
+        return extendStatics(d, b);
     };
-    Request.prototype.envDesc = function () {
-        if (Window) {
-            return "Window";
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() {
+            this.constructor = d;
         }
-        return "Node";
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
-    Request.prototype.ajax = function (url, opts) {
-        var _a = (0, index_js_1.defer)(),
-            promise = _a.promise,
-            resolve = _a.resolve,
-            reject = _a.reject;
-        var _b = opts.method,
-            method = _b === void 0 ? "GET" : _b,
-            _c = opts.params,
-            params = _c === void 0 ? {} : _c,
-            _d = opts.body,
-            body = _d === void 0 ? {} : _d,
-            _e = opts.async,
-            async = _e === void 0 ? true : _e,
-            _f = opts.timeout,
-            timeout = _f === void 0 ? 30 * 1000 : _f;
-        var xhr = new XMLHttpRequest();
-        switch (method) {
-            case 'GET':
+}();
+var __assign = this && this.__assign || function () {
+    __assign = Object.assign || function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = this && this.__rest || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+    }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.Request = exports.RequestBase = exports.Interceptors = void 0;
+var index_js_1 = require("./index.js");
+var Interceptors = function () {
+    function Interceptors() {}
+    Interceptors.prototype.use = function (type, fn) {
+        switch (type) {
+            case "request":
+                this.requestSuccess = fn;
+                break;
+            case "response":
+                this.responseSuccess = fn;
                 break;
-            default:
+            case "error":
+                this.error = fn;
                 break;
         }
-        xhr.addEventListener('load', function () {
-            if (xhr.readyState === 4 && xhr.status === 200) {
-                try {} catch (error) {}
-            } else {}
-        });
-        xhr.open(method, url, async);
-        xhr.send(body);
-        xhr.timeout = async && timeout;
-    };
-    Request.prototype.fetch = function () {
-        return fetch("");
+        return this;
     };
-    Request.prototype.http = function () {};
-    return Request;
+    Object.defineProperty(Interceptors.prototype, "reqFn", {
+        get: function () {
+            return this.requestSuccess;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Interceptors.prototype, "resFn", {
+        get: function () {
+            return this.responseSuccess;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Interceptors.prototype, "errFn", {
+        get: function () {
+            return this.error;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return Interceptors;
 }();
-exports.Request = Request;
-var GET = function () {};
-exports.GET = GET;
-var POST = function () {};
-exports.POST = POST;
-var PUT = function () {};
-exports.PUT = PUT;
-var DELETE = function () {};
-exports.DELETE = DELETE;
-var OPTION = function () {};
-exports.OPTION = OPTION;
+exports.Interceptors = Interceptors;
+var RequestBase = function (_super) {
+    __extends(RequestBase, _super);
+    function RequestBase(origin) {
+        var _this = _super.call(this) || this;
+        _this.chackUrl = function (url) {
+            return url.startsWith('/');
+        };
+        _this.fixOrigin = function (fixStr) {
+            if (_this.chackUrl(fixStr)) return _this.origin + fixStr;
+            return fixStr;
+        };
+        _this.envDesc = function () {
+            if (Window) {
+                return "Window";
+            }
+            return "Node";
+        };
+        _this.requestType = function () {
+            switch (_this.envDesc()) {
+                case "Window":
+                    return _this.fetch;
+                case "Node":
+                    return _this.http;
+            }
+        };
+        _this.initFetchParams = function (url, _a) {
+            var _b, _c;
+            var _d = _a.method,
+                method = _d === void 0 ? "GET" : _d,
+                _e = _a.query,
+                query = _e === void 0 ? {} : _e,
+                _f = _a.headers,
+                headers = _f === void 0 ? {} : _f,
+                _g = _a.body,
+                body = _g === void 0 ? null : _g,
+                _h = _a.timeout,
+                timeout = _h === void 0 ? 30 * 1000 : _h,
+                _j = _a.abort,
+                abort = _j === void 0 ? new AbortController() : _j,
+                _k = _a.type,
+                type = _k === void 0 ? "json" : _k,
+                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "abort", "type"]);
+            url = (0, index_js_1.urlJoin)(_this.fixOrigin(url), query);
+            var timer = setTimeout(function () {
+                return abort.abort();
+            }, timeout);
+            var params = __assign({ url: url, method: method, headers: headers, body: method === "GET" ? null : (0, index_js_1.jsonToString)(body), timeout: timeout, timer: timer, signal: abort.signal, type: type }, others);
+            return (_c = (_b = _this.reqFn) === null || _b === void 0 ? void 0 : _b.call(_this, params)) !== null && _c !== void 0 ? _c : params;
+        };
+        _this.getDataByType = function (type, response) {
+            switch (type) {
+                case "text":
+                case "json":
+                case "blob":
+                case "formData":
+                case "arrayBuffer":
+                    return response[type]();
+                default:
+                    return response['json']();
+            }
+        };
+        _this.origin = origin !== null && origin !== void 0 ? origin : '';
+        return _this;
+    }
+    return RequestBase;
+}(Interceptors);
+exports.RequestBase = RequestBase;
+var Request = function (_super) {
+    __extends(Request, _super);
+    function Request(origin) {
+        var _this = _super.call(this, origin) || this;
+        _this.fetch = function (_url, _opts) {
+            var _a = (0, index_js_1.defer)(),
+                promise = _a.promise,
+                resolve = _a.resolve,
+                reject = _a.reject;
+            var _b = _this.initFetchParams(_url, _opts),
+                url = _b.url,
+                opts = __rest(_b, ["url"]);
+            var signal = opts.signal,
+                timer = opts.timer;
+            var errorFn = function (err) {
+                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
+            };
+            signal.addEventListener('abort', errorFn);
+            fetch(url, opts).then(function (response) {
+                if (response.status >= 200 && response.status < 300) {
+                    return _this.getDataByType(opts.type, response);
+                }
+                return errorFn(response.statusText);
+            }).then(function (res) {
+                var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
+            }).catch(errorFn).finally(function () {
+                return clearTimeout(timer);
+            });
+            return promise;
+        };
+        _this.http = function (url, opts) {
+            var _a = (0, index_js_1.defer)(),
+                promise = _a.promise,
+                resolve = _a.resolve,
+                reject = _a.reject;
+            return promise;
+        };
+        _this.GET = function (url, query, _, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "GET" }, opts));
+        };
+        _this.POST = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "POST", body: body }, opts));
+        };
+        _this.PUT = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "PUT", body: body }, opts));
+        };
+        _this.DELETE = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+        };
+        _this.OPTION = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+        };
+        _this.request = _this.requestType();
+        return _this;
+    }
+    return Request;
+}(RequestBase);
+exports.Request = Request;

package/dist/common/types.d.ts

@@ -15,6 +15,7 @@ export declare type IRandomNum = (min: number, max: number, bool?: boolean) => n
 export declare type IUrlSplit = (url: string) => IObject<any>;
 export declare type IUrlJoin = (url: string, query: object) => string;
 export declare type IGetType<T> = (data: any) => typeof data | T[keyof T] | "null";
+export declare type IGetTypeByList = (data: any, whiteList: string[]) => boolean;
 export declare type IGetValue = <T>(object: IObject<T> | IObject<T>[IKey], key: string, defaultValue?: any) => IObject<T>[IKey];
 export declare type ISetValue = <T>(object: IObject<T>, key: string, value?: any) => IObject<T>;
 export declare type IMixIn = <U extends IObject<any>>(target?: U, source?: IObject<any>, overwrite?: boolean) => U;
@@ -25,6 +26,8 @@ export declare type ICreateObject = <T, U extends T>(source: T) => U;
 export declare type IInherit = <T extends Function>(source: T, target?: Function) => Function;
 export declare type IGetInstance = (classProto: IInstance<FunctionConstructor>, overwrite?: boolean, ...params: any[]) => Function;
 export declare type IClassDecorator = (params: IObject<any>) => <TFunction extends Function>(target: TFunction) => void;
+export declare type IStringToJson = (target: string) => IObject<any>;
+export declare type IJsonToString = (target: IObject<any>) => string;
 export declare type IThrottle = (fn: Function, time: number) => (...args: any[]) => void;
 export declare type IDebounce = (fn: Function, time: number) => (...args: any[]) => void;
 export declare type IDefer = () => IPromise;
@@ -44,11 +47,43 @@ export declare type IStopBubble = (e: Event) => void;
 export declare type IStopDefault = (e: Event) => void;
 export declare type IRemoveHandler = <T extends Document>(ele: T, type: string, handler: (e: Event) => void) => void;
 export declare type IDispatchEvent = <T extends Document>(ele: T, data: any) => void;
-export declare type IRequest = {
+export declare type IRequestParams<T> = T | IObject<any> | null;
+export declare type IDataType = "text" | "json" | "blob" | "formData" | "arrayBuffer";
+export declare type IRequestMethods = "GET" | "POST" | "DELETE" | "PUT" | "OPTION";
+export declare type IRequestBody = IRequestParams<BodyInit>;
+export declare type IRequestHeaders = IRequestParams<HeadersInit>;
+export declare type IRequestFn = (url: string, params: IObject<any>, body: IRequestBody, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestOptions = {
+    method?: IRequestMethods;
+    query?: IRequestParams<IObject<any>>;
+    body?: IRequestBody;
+    headers?: IRequestHeaders;
+    abort?: AbortController;
+    timeout?: number;
+    [key: string]: any;
+};
+export declare type IInterceptors = {
+    use(type: "request" | "response" | "error", fn: Function): void;
+    get reqFn(): Function;
+    get resFn(): Function;
+    get errFn(): Function;
+};
+export declare type IRequestBase = {
     origin: string;
-    fixOrigin: <T = string>(origin: T) => IRequest;
+    fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
-    fetch: () => Promise<Response>;
+    chackUrl: (url: string) => boolean;
+    fetch: (url: string, opts: IRequestOptions) => Promise<any>;
+    http: (url: string, opts: IRequestOptions) => Promise<any>;
+    initFetchParams: (url: string, opts: IRequestOptions) => any;
+    getDataByType: (type: IDataType, response: Response) => Promise<any>;
 };
-export declare type IGet = (url: string, params: IObject<any>) => Promise<void>;
+export declare type IRequest = {
+    request: Function;
+    GET: IRequestFn;
+    POST: IRequestFn;
+    DELETE: IRequestFn;
+    PUT: IRequestFn;
+    OPTION: IRequestFn;
+} & IRequestBase;
 export {};

package/dist/esm/base.d.ts

@@ -1,5 +1,6 @@
-import { IRandomNum, IUrlSplit, IUrlJoin, IGetType, types } from "./index.js";
+import { IRandomNum, IUrlSplit, IUrlJoin, IGetType, IGetTypeByList, types } from "./index.js";
 export declare const randomNum: IRandomNum;
 export declare const urlSplit: IUrlSplit;
 export declare const urlJoin: IUrlJoin;
 export declare const getType: IGetType<types>;
+export declare const getTypeByList: IGetTypeByList;

package/dist/esm/base.js

@@ -18,7 +18,12 @@ export var urlSplit = function (url) {
     return result;
 };
 export var urlJoin = function (url, query) {
-    var params = Object.keys(query).map(function (i) {
+    if (query === void 0) {
+        query = {};
+    }
+    var queryObject = Object.keys(query);
+    if (queryObject.length === 0) return url;
+    var params = queryObject.map(function (i) {
         return "".concat(i, "=").concat(query[i]);
     });
     return "".concat(url).concat(url.includes("?") ? "&" : '?').concat(params.join("&"));
@@ -32,4 +37,11 @@ export var getType = function (data) {
         return types[key];
     }
     return type;
+};
+export var getTypeByList = function (data, whiteList) {
+    if (whiteList === void 0) {
+        whiteList = [];
+    }
+    var __type = getType(data);
+    return whiteList.indexOf(__type) > 0;
 };

package/dist/esm/object.d.ts

@@ -1,4 +1,4 @@
-import { IGetValue, ISetValue, IMixIn, ICloneDeep, ICreateObjectVariable, IEnumInversion, IInherit, ICreateObject, IGetInstance, IClassDecorator } from "./index.js";
+import { IGetValue, ISetValue, IMixIn, ICloneDeep, ICreateObjectVariable, IEnumInversion, IInherit, ICreateObject, IGetInstance, IClassDecorator, IStringToJson, IJsonToString } from "./index.js";
 export declare const getValue: IGetValue;
 export declare const setValue: ISetValue;
 export declare const mixIn: IMixIn;
@@ -10,3 +10,5 @@ export declare const createObject: ICreateObject;
 export declare const inherit: IInherit;
 export declare const getInstance: IGetInstance;
 export declare const classDecorator: IClassDecorator;
+export declare const stringToJson: IStringToJson;
+export declare const jsonToString: IJsonToString;

package/dist/esm/object.js

@@ -7,7 +7,7 @@ var __spreadArray = this && this.__spreadArray || function (to, from, pack) {
     }
     return to.concat(ar || Array.prototype.slice.call(from));
 };
-import { getType } from "./index.js";
+import { getType, getTypeByList } from "./index.js";
 export var getValue = function (object, key, defaultValue) {
     if (defaultValue === void 0) {
         defaultValue = '';
@@ -149,4 +149,20 @@ export var classDecorator = function (params) {
             }
         }
     };
+};
+export var stringToJson = function (target) {
+    if (getType(target) !== "string") return {};
+    try {
+        return JSON.parse(target);
+    } catch (error) {
+        return {};
+    }
+};
+export var jsonToString = function (target) {
+    if (!getTypeByList(target, ["array", "object", "set", "map"])) return "";
+    try {
+        return JSON.stringify(target);
+    } catch (error) {
+        return "";
+    }
 };

package/dist/esm/request.d.ts

@@ -1,15 +1,42 @@
-import { IRequest } from "./index.js";
-export declare class Request implements IRequest {
+import { IRequest, IRequestBase, IInterceptors } from "./index.js";
+export declare class Interceptors implements IInterceptors {
+    private requestSuccess;
+    private responseSuccess;
+    private error;
+    use(type: any, fn: any): this;
+    get reqFn(): Function;
+    get resFn(): Function;
+    get errFn(): Function;
+}
+export declare abstract class RequestBase extends Interceptors implements IRequestBase {
     origin: string;
-    constructor();
-    fixOrigin(origin: any): this;
-    envDesc(): "Window" | "Node";
-    ajax(url: any, opts: any): void;
-    fetch(): Promise<Response>;
-    http(): void;
+    constructor(origin: any);
+    abstract fetch(url: any, opts: any): Promise<void>;
+    abstract http(url: any, opts: any): Promise<void>;
+    chackUrl: (url: any) => any;
+    fixOrigin: (fixStr: string) => string;
+    envDesc: () => "Window" | "Node";
+    requestType: () => (url: any, opts: any) => Promise<void>;
+    initFetchParams: (url: any, { method, query, headers, body, timeout, abort, type, ...others }: {
+        [x: string]: any;
+        method?: string;
+        query?: {};
+        headers?: {};
+        body?: any;
+        timeout?: number;
+        abort?: AbortController;
+        type?: string;
+    }) => any;
+    getDataByType: (type: any, response: any) => any;
+}
+export declare class Request extends RequestBase implements IRequest {
+    request: Function;
+    constructor(origin: any);
+    fetch: (_url: any, _opts: any) => Promise<void>;
+    http: (url: any, opts: any) => Promise<void>;
+    GET: (url: any, query: {}, _: any, opts: any) => any;
+    POST: (url: any, query: {}, body: any, opts: any) => any;
+    PUT: (url: any, query: {}, body: any, opts: any) => any;
+    DELETE: (url: any, query: {}, body: any, opts: any) => any;
+    OPTION: (url: any, query: {}, body: any, opts: any) => any;
 }
-export declare const GET: () => void;
-export declare const POST: () => void;
-export declare const PUT: () => void;
-export declare const DELETE: () => void;
-export declare const OPTION: () => void;

package/dist/esm/request.js

@@ -1,56 +1,217 @@
-import { defer } from "./index.js";
-var Request = function () {
-    function Request() {}
-    Request.prototype.fixOrigin = function (origin) {
-        this.origin = origin;
-        return this;
+var __extends = this && this.__extends || function () {
+    var extendStatics = function (d, b) {
+        extendStatics = Object.setPrototypeOf || { __proto__: [] } instanceof Array && function (d, b) {
+            d.__proto__ = b;
+        } || function (d, b) {
+            for (var p in b) if (Object.prototype.hasOwnProperty.call(b, p)) d[p] = b[p];
+        };
+        return extendStatics(d, b);
     };
-    Request.prototype.envDesc = function () {
-        if (Window) {
-            return "Window";
+    return function (d, b) {
+        if (typeof b !== "function" && b !== null) throw new TypeError("Class extends value " + String(b) + " is not a constructor or null");
+        extendStatics(d, b);
+        function __() {
+            this.constructor = d;
         }
-        return "Node";
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
-    Request.prototype.ajax = function (url, opts) {
-        var _a = defer(),
-            promise = _a.promise,
-            resolve = _a.resolve,
-            reject = _a.reject;
-        var _b = opts.method,
-            method = _b === void 0 ? "GET" : _b,
-            _c = opts.params,
-            params = _c === void 0 ? {} : _c,
-            _d = opts.body,
-            body = _d === void 0 ? {} : _d,
-            _e = opts.async,
-            async = _e === void 0 ? true : _e,
-            _f = opts.timeout,
-            timeout = _f === void 0 ? 30 * 1000 : _f;
-        var xhr = new XMLHttpRequest();
-        switch (method) {
-            case 'GET':
+}();
+var __assign = this && this.__assign || function () {
+    __assign = Object.assign || function (t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+var __rest = this && this.__rest || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0) t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function") for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+        if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i])) t[p[i]] = s[p[i]];
+    }
+    return t;
+};
+import { urlJoin, defer, jsonToString } from "./index.js";
+var Interceptors = function () {
+    function Interceptors() {}
+    Interceptors.prototype.use = function (type, fn) {
+        switch (type) {
+            case "request":
+                this.requestSuccess = fn;
+                break;
+            case "response":
+                this.responseSuccess = fn;
                 break;
-            default:
+            case "error":
+                this.error = fn;
                 break;
         }
-        xhr.addEventListener('load', function () {
-            if (xhr.readyState === 4 && xhr.status === 200) {
-                try {} catch (error) {}
-            } else {}
-        });
-        xhr.open(method, url, async);
-        xhr.send(body);
-        xhr.timeout = async && timeout;
-    };
-    Request.prototype.fetch = function () {
-        return fetch("");
+        return this;
     };
-    Request.prototype.http = function () {};
-    return Request;
+    Object.defineProperty(Interceptors.prototype, "reqFn", {
+        get: function () {
+            return this.requestSuccess;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Interceptors.prototype, "resFn", {
+        get: function () {
+            return this.responseSuccess;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    Object.defineProperty(Interceptors.prototype, "errFn", {
+        get: function () {
+            return this.error;
+        },
+        enumerable: false,
+        configurable: true
+    });
+    return Interceptors;
 }();
-export { Request };
-export var GET = function () {};
-export var POST = function () {};
-export var PUT = function () {};
-export var DELETE = function () {};
-export var OPTION = function () {};
+export { Interceptors };
+var RequestBase = function (_super) {
+    __extends(RequestBase, _super);
+    function RequestBase(origin) {
+        var _this = _super.call(this) || this;
+        _this.chackUrl = function (url) {
+            return url.startsWith('/');
+        };
+        _this.fixOrigin = function (fixStr) {
+            if (_this.chackUrl(fixStr)) return _this.origin + fixStr;
+            return fixStr;
+        };
+        _this.envDesc = function () {
+            if (Window) {
+                return "Window";
+            }
+            return "Node";
+        };
+        _this.requestType = function () {
+            switch (_this.envDesc()) {
+                case "Window":
+                    return _this.fetch;
+                case "Node":
+                    return _this.http;
+            }
+        };
+        _this.initFetchParams = function (url, _a) {
+            var _b, _c;
+            var _d = _a.method,
+                method = _d === void 0 ? "GET" : _d,
+                _e = _a.query,
+                query = _e === void 0 ? {} : _e,
+                _f = _a.headers,
+                headers = _f === void 0 ? {} : _f,
+                _g = _a.body,
+                body = _g === void 0 ? null : _g,
+                _h = _a.timeout,
+                timeout = _h === void 0 ? 30 * 1000 : _h,
+                _j = _a.abort,
+                abort = _j === void 0 ? new AbortController() : _j,
+                _k = _a.type,
+                type = _k === void 0 ? "json" : _k,
+                others = __rest(_a, ["method", "query", "headers", "body", "timeout", "abort", "type"]);
+            url = urlJoin(_this.fixOrigin(url), query);
+            var timer = setTimeout(function () {
+                return abort.abort();
+            }, timeout);
+            var params = __assign({ url: url, method: method, headers: headers, body: method === "GET" ? null : jsonToString(body), timeout: timeout, timer: timer, signal: abort.signal, type: type }, others);
+            return (_c = (_b = _this.reqFn) === null || _b === void 0 ? void 0 : _b.call(_this, params)) !== null && _c !== void 0 ? _c : params;
+        };
+        _this.getDataByType = function (type, response) {
+            switch (type) {
+                case "text":
+                case "json":
+                case "blob":
+                case "formData":
+                case "arrayBuffer":
+                    return response[type]();
+                default:
+                    return response['json']();
+            }
+        };
+        _this.origin = origin !== null && origin !== void 0 ? origin : '';
+        return _this;
+    }
+    return RequestBase;
+}(Interceptors);
+export { RequestBase };
+var Request = function (_super) {
+    __extends(Request, _super);
+    function Request(origin) {
+        var _this = _super.call(this, origin) || this;
+        _this.fetch = function (_url, _opts) {
+            var _a = defer(),
+                promise = _a.promise,
+                resolve = _a.resolve,
+                reject = _a.reject;
+            var _b = _this.initFetchParams(_url, _opts),
+                url = _b.url,
+                opts = __rest(_b, ["url"]);
+            var signal = opts.signal,
+                timer = opts.timer;
+            var errorFn = function (err) {
+                var _a, _b;return reject((_b = (_a = _this.errFn) === null || _a === void 0 ? void 0 : _a.call(_this, err)) !== null && _b !== void 0 ? _b : err);
+            };
+            signal.addEventListener('abort', errorFn);
+            fetch(url, opts).then(function (response) {
+                if (response.status >= 200 && response.status < 300) {
+                    return _this.getDataByType(opts.type, response);
+                }
+                return errorFn(response.statusText);
+            }).then(function (res) {
+                var _a, _b;return resolve((_b = (_a = _this.resFn) === null || _a === void 0 ? void 0 : _a.call(_this, res)) !== null && _b !== void 0 ? _b : res);
+            }).catch(errorFn).finally(function () {
+                return clearTimeout(timer);
+            });
+            return promise;
+        };
+        _this.http = function (url, opts) {
+            var _a = defer(),
+                promise = _a.promise,
+                resolve = _a.resolve,
+                reject = _a.reject;
+            return promise;
+        };
+        _this.GET = function (url, query, _, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "GET" }, opts));
+        };
+        _this.POST = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "POST", body: body }, opts));
+        };
+        _this.PUT = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "PUT", body: body }, opts));
+        };
+        _this.DELETE = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+        };
+        _this.OPTION = function (url, query, body, opts) {
+            if (query === void 0) {
+                query = {};
+            }
+            return _this.request(url, __assign({ query: query, method: "DELETE", body: body }, opts));
+        };
+        _this.request = _this.requestType();
+        return _this;
+    }
+    return Request;
+}(RequestBase);
+export { Request };

package/dist/esm/types.d.ts

@@ -15,6 +15,7 @@ export declare type IRandomNum = (min: number, max: number, bool?: boolean) => n
 export declare type IUrlSplit = (url: string) => IObject<any>;
 export declare type IUrlJoin = (url: string, query: object) => string;
 export declare type IGetType<T> = (data: any) => typeof data | T[keyof T] | "null";
+export declare type IGetTypeByList = (data: any, whiteList: string[]) => boolean;
 export declare type IGetValue = <T>(object: IObject<T> | IObject<T>[IKey], key: string, defaultValue?: any) => IObject<T>[IKey];
 export declare type ISetValue = <T>(object: IObject<T>, key: string, value?: any) => IObject<T>;
 export declare type IMixIn = <U extends IObject<any>>(target?: U, source?: IObject<any>, overwrite?: boolean) => U;
@@ -25,6 +26,8 @@ export declare type ICreateObject = <T, U extends T>(source: T) => U;
 export declare type IInherit = <T extends Function>(source: T, target?: Function) => Function;
 export declare type IGetInstance = (classProto: IInstance<FunctionConstructor>, overwrite?: boolean, ...params: any[]) => Function;
 export declare type IClassDecorator = (params: IObject<any>) => <TFunction extends Function>(target: TFunction) => void;
+export declare type IStringToJson = (target: string) => IObject<any>;
+export declare type IJsonToString = (target: IObject<any>) => string;
 export declare type IThrottle = (fn: Function, time: number) => (...args: any[]) => void;
 export declare type IDebounce = (fn: Function, time: number) => (...args: any[]) => void;
 export declare type IDefer = () => IPromise;
@@ -44,11 +47,43 @@ export declare type IStopBubble = (e: Event) => void;
 export declare type IStopDefault = (e: Event) => void;
 export declare type IRemoveHandler = <T extends Document>(ele: T, type: string, handler: (e: Event) => void) => void;
 export declare type IDispatchEvent = <T extends Document>(ele: T, data: any) => void;
-export declare type IRequest = {
+export declare type IRequestParams<T> = T | IObject<any> | null;
+export declare type IDataType = "text" | "json" | "blob" | "formData" | "arrayBuffer";
+export declare type IRequestMethods = "GET" | "POST" | "DELETE" | "PUT" | "OPTION";
+export declare type IRequestBody = IRequestParams<BodyInit>;
+export declare type IRequestHeaders = IRequestParams<HeadersInit>;
+export declare type IRequestFn = (url: string, params: IObject<any>, body: IRequestBody, opts: IRequestOptions) => Promise<any>;
+export declare type IRequestOptions = {
+    method?: IRequestMethods;
+    query?: IRequestParams<IObject<any>>;
+    body?: IRequestBody;
+    headers?: IRequestHeaders;
+    abort?: AbortController;
+    timeout?: number;
+    [key: string]: any;
+};
+export declare type IInterceptors = {
+    use(type: "request" | "response" | "error", fn: Function): void;
+    get reqFn(): Function;
+    get resFn(): Function;
+    get errFn(): Function;
+};
+export declare type IRequestBase = {
     origin: string;
-    fixOrigin: <T = string>(origin: T) => IRequest;
+    fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
-    fetch: () => Promise<Response>;
+    chackUrl: (url: string) => boolean;
+    fetch: (url: string, opts: IRequestOptions) => Promise<any>;
+    http: (url: string, opts: IRequestOptions) => Promise<any>;
+    initFetchParams: (url: string, opts: IRequestOptions) => any;
+    getDataByType: (type: IDataType, response: Response) => Promise<any>;
 };
-export declare type IGet = (url: string, params: IObject<any>) => Promise<void>;
+export declare type IRequest = {
+    request: Function;
+    GET: IRequestFn;
+    POST: IRequestFn;
+    DELETE: IRequestFn;
+    PUT: IRequestFn;
+    OPTION: IRequestFn;
+} & IRequestBase;
 export {};

package/index.html

@@ -9,7 +9,29 @@
   <body>
     <script type="module">
       import { Request } from "./dist/esm/request.js";
-      console.log(Request);
+      const resource = new Request("http://127.0.0.1:1024");
+      resource
+        .use("request", (params) => {
+          return params;
+        })
+        .use("response", (params) => {
+          return params;
+        })
+        .use("error", (error) => {
+          console.log(error)
+          return error;
+        });
+      resource
+        .GET(
+          "/getList",
+          {
+            name: "hello",
+            age: 22,
+          },
+          {},
+          {}
+        )
+        .then((res) => console.log(res));
     </script>
   </body>
 </html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-lib-js",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "JavaScript工具函数，封装的一些常用的js函数",
   "main": "./dist/common/index.js",
   "types": "./dist/common/index.d.ts",