utils-lib-js 1.0.3 → 1.0.6

package/dist/esm/request.js

@@ -1,18 +1,199 @@
-var Request = function () {
-    function Request() {}
-    Request.prototype.fixOrigin = function (origin) {
-        return origin;
-    };
-    Request.prototype.envDesc = function () {
-        if (Window) {
-            return "Window";
-        }
-        return "Node";
-    };
-    return Request;
-}();
-export { Request };
-export var GET = function () {};
-export var POST = function () {};
-export var PUT = function () {};
-export var DELETE = function () {};
+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);
+    };
+    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; }
+        d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+    };
+})();
+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";
+import { request } from "node:http";
+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;
+            case "error":
+                this.error = fn;
+                break;
+        }
+        return this;
+    };
+    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 { 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 (typeof Window !== "undefined") {
+                return "Window";
+            }
+            return "Node";
+        };
+        _this.errorFn = function (reject) { return 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); }; };
+        _this.clearTimer = function (opts) { return !!opts.timer && (clearTimeout(opts.timer), opts.timer = null); };
+        _this.requestType = function () {
+            switch (_this.envDesc()) {
+                case "Window":
+                    return _this.fetch;
+                case "Node":
+                    return _this.http;
+            }
+        };
+        _this.initDefaultParams = function (url, _a) {
+            var _b = _a.method, method = _b === void 0 ? "GET" : _b, _c = _a.query, query = _c === void 0 ? {} : _c, _d = _a.headers, headers = _d === void 0 ? {} : _d, _e = _a.body, body = _e === void 0 ? null : _e, _f = _a.timeout, timeout = _f === void 0 ? 30 * 1000 : _f, _g = _a.controller, controller = _g === void 0 ? new AbortController() : _g, _h = _a.type, type = _h === void 0 ? "json" : _h, others = __rest(_a, ["method", "query", "headers", "body", "timeout", "controller", "type"]);
+            return (__assign({ url: urlJoin(_this.fixOrigin(url), query), method: method, headers: headers, body: method === "GET" ? null : jsonToString(body), timeout: timeout, signal: controller.signal, controller: controller, type: type, timer: null }, others));
+        };
+        _this.initFetchParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initDefaultParams(url, opts);
+            var controller = params.controller, timer = params.timer, timeout = params.timeout;
+            !!!timer && (params.timer = setTimeout(function () { return controller.abort(); }, timeout));
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, params)) !== null && _b !== void 0 ? _b : params;
+        };
+        _this.initHttpParams = function (url, opts) {
+            var _a, _b;
+            var params = _this.initDefaultParams(url, opts);
+            return (_b = (_a = _this.reqFn) === null || _a === void 0 ? void 0 : _a.call(_this, params)) !== null && _b !== void 0 ? _b : 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;
+            signal.addEventListener('abort', _this.errorFn(reject));
+            fetch(url, opts).then(function (response) {
+                if (response.status >= 200 && response.status < 300) {
+                    return _this.getDataByType(opts.type, response);
+                }
+                return _this.errorFn(reject);
+            }).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(_this.errorFn(reject)).finally(function () { return _this.clearTimer(opts); });
+            return promise;
+        };
+        _this.http = 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"]);
+            request(url, opts, resolve);
+            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.OPTIONS = function (url, query, body, opts) {
+            if (query === void 0) { query = {}; }
+            return _this.request(url, __assign({ query: query, method: "OPTIONS", body: body }, opts));
+        };
+        _this.HEAD = function (url, query, body, opts) {
+            if (query === void 0) { query = {}; }
+            return _this.request(url, __assign({ query: query, method: "HEAD", body: body }, opts));
+        };
+        _this.PATCH = function (url, query, body, opts) {
+            if (query === void 0) { query = {}; }
+            return _this.request(url, __assign({ query: query, method: "PATCH", body: body }, opts));
+        };
+        _this.request = _this.requestType();
+        return _this;
+    }
+    return Request;
+}(RequestBase));
+export { Request };

package/dist/esm/static.js

@@ -1,14 +1,14 @@
-export var types;
-(function (types) {
-    types["[object Array]"] = "array";
-    types["[object Object]"] = "object";
-    types["[object Function]"] = "function";
-    types["[object Set]"] = "set";
-    types["[object Map]"] = "map";
-    types["[object WeakMap]"] = "weakMap";
-    types["[object WeakSet]"] = "weakSet";
-    types["[object Date]"] = "date";
-    types["[object RegExp]"] = "regExp";
-    types["[object Math]"] = "math";
-})(types || (types = {}));
-;
+export var types;
+(function (types) {
+    types["[object Array]"] = "array";
+    types["[object Object]"] = "object";
+    types["[object Function]"] = "function";
+    types["[object Set]"] = "set";
+    types["[object Map]"] = "map";
+    types["[object WeakMap]"] = "weakMap";
+    types["[object WeakSet]"] = "weakSet";
+    types["[object Date]"] = "date";
+    types["[object RegExp]"] = "regExp";
+    types["[object Math]"] = "math";
+})(types || (types = {}));
+;

package/dist/esm/storage.js

@@ -1,27 +1,30 @@
-export var setStorage = function (key, val) {
-    try {
-        localStorage.setItem(key, JSON.stringify(val));
-    } catch (error) {
-        console.error(error);
-    }
-};
-export var getStorage = function (key) {
-    try {
-        var str = localStorage.getItem(key);
-        if (str === null || str === undefined) {
-            return null;
-        }
-        return JSON.parse(str);
-    } catch (error) {
-        console.error(error);
-        return null;
-    }
-};
-export var clearStorage = function (key) {
-    try {
-        key && localStorage.removeItem(key);
-        !key && localStorage.clear();
-    } catch (error) {
-        console.error(error);
-    }
-};
+export var setStorage = function (key, val) {
+    try {
+        localStorage.setItem(key, JSON.stringify(val));
+    }
+    catch (error) {
+        console.error(error);
+    }
+};
+export var getStorage = function (key) {
+    try {
+        var str = localStorage.getItem(key);
+        if (str === null || str === undefined) {
+            return null;
+        }
+        return JSON.parse(str);
+    }
+    catch (error) {
+        console.error(error);
+        return null;
+    }
+};
+export var clearStorage = function (key) {
+    try {
+        key && localStorage.removeItem(key);
+        !key && localStorage.clear();
+    }
+    catch (error) {
+        console.error(error);
+    }
+};

package/dist/esm/types.d.ts

@@ -4,8 +4,8 @@ export interface IObject<T> {
 }
 export interface IPromise extends IObject<any> {
     promise: Promise<void>;
-    resolve: () => unknown;
-    reject: () => unknown;
+    resolve: (res: any) => unknown;
+    reject: (err: any) => unknown;
 }
 export declare type IInstance<T> = {
     _instance: Function;
@@ -15,7 +15,8 @@ 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 IGetValue = <T>(object: IObject<T> | IObject<T>[IKey], key: string, defaultValue?: any) => IObject<T>[IKey];
+export declare type IGetTypeByList = (data: any, whiteList: string[]) => boolean;
+export declare type IGetValue = <T, U = IObject<T> | IObject<T>[IKey]>(object: U, key: string, defaultValue?: any) => U;
 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;
 export declare type IEnumInversion = (target: IObject<string>) => IObject<string>;
@@ -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,10 +47,48 @@ 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;
+    controller?: AbortController;
+    timeout?: number;
+    timer?: number | unknown | null;
+    [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) => T;
+    fixOrigin: (fixStr: string) => string;
     envDesc: () => "Window" | "Node";
+    chackUrl: (url: string) => boolean;
+    fetch: (url: string, opts: IRequestOptions) => Promise<any>;
+    http: (url: string, opts: IRequestOptions) => Promise<any>;
+    initDefaultParams: (url: string, opts: IRequestOptions) => any;
+    initFetchParams: (url: string, opts: IRequestOptions) => any;
+    initHttpParams: (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;
+    OPTIONS: IRequestFn;
+    HEAD: IRequestFn;
+    PATCH: IRequestFn;
+} & IRequestBase;
 export {};

package/dist/esm/types.js

@@ -1 +1 @@
-export {};
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "utils-lib-js",
-  "version": "1.0.3",
+  "version": "1.0.6",
   "description": "JavaScript工具函数，封装的一些常用的js函数",
   "main": "./dist/common/index.js",
   "types": "./dist/common/index.d.ts",
@@ -10,9 +10,11 @@
     "require": "./dist/common/index.js"
   },
   "scripts": {
-    "debug": "start cmd /k pnpm run build:hot & pnpm run node:hot",
-    "node:hot": "nodemon ./dist/common/index.js",
-    "build:hot": "tsc -p tsconfig.json -w",
+    "debug:esm": "start cmd /k pnpm run build:hot:esm",
+    "debug:node": "start cmd /k pnpm run build:hot:node & pnpm run node:hot",
+    "node:hot": "nodemon ./example/server.js",
+    "build:hot:esm": "tsc -p tsconfig.es.json -w",
+    "build:hot:node": "tsc -p tsconfig.json -w",
     "build": "pnpm run tsc:build && pnpm run babel:mjs &&  pnpm run babel:cjs",
     "tsc:build": "rm -fr dist && tsc -p tsconfig.json && tsc -p tsconfig.es.json",
     "publish": "pnpm run build && pnpm publish",
@@ -24,13 +26,18 @@
     "type": "git",
     "url": "https://gitee.com/DieHunter/utils-lib-js.git"
   },
-  "keywords": ["utils", "tools", "lib"],
+  "keywords": [
+    "utils",
+    "tools",
+    "lib"
+  ],
   "author": "",
   "license": "ISC",
   "dependencies": {
     "event-message-center": "^1.0.16"
   },
   "devDependencies": {
+    "@types/node": "^18.7.1",
     "babel-cli": "^6.26.0"
   }
 }

package/tsconfig.es.json

@@ -1,12 +1,8 @@
 {
     "extends": "./tsconfig",
     "compilerOptions": {
-        "module": "es2015",
+        "module": "ES6",
         "outDir": "dist/esm",
-        "moduleResolution": "node"
-    },
-    "exclude": [
-        "**/__tests__/**",
-        "**/example/**"
-    ]
+        "rootDir": "src"
+    }
 }