@gopowerteam/request 0.1.10 → 0.1.12

package/dist/adapters/index.cjs

@@ -19,6 +19,10 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
@@ -37,110 +41,26 @@ module.exports = __toCommonJS(adapters_exports);
 
 // src/adapters/axios.adapter.ts
 var import_axios = __toESM(require("axios"), 1);
-
-// src/request-service.ts
-var _RequestService = class {
-  static getInstance() {
-    if (this.instance) {
-      return this.instance;
-    }
-    return new _RequestService();
-  }
-  getRequestAdapter() {
-    if (!_RequestService.config.adapter) {
-      throw new Error("\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E\u8BF7\u6C42Adatper");
-    }
-    return _RequestService.config.adapter;
-  }
-  execRequestPlugin(plugins = [], options) {
-    _RequestService.config.plugins.forEach(
-      (service) => service.before && service.before(options)
-    );
-    plugins.forEach((service) => service.before && service.before(options));
-  }
-  execResponsePlugin(leftcycle, plugins = [], options, response) {
-    plugins.forEach((plugin) => {
-      const leftcycleFn = plugin[leftcycle];
-      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
-    });
-    _RequestService.config.plugins.forEach((plugin) => {
-      const leftcycleFn = plugin[leftcycle];
-      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
-    });
-  }
-  parseRequestPath(path, paramsPath) {
-    if (paramsPath) {
-      return Object.entries(paramsPath).reduce(
-        (r, [key, value]) => r.replace(`{${key}}`, value.toString()),
-        path
-      );
-    } else {
-      return path;
-    }
-  }
-  startRequest(adapter, options) {
-    return adapter.request({
-      baseURL: _RequestService.config.gateway,
-      pathURL: this.parseRequestPath(options.path, options.paramsPath),
-      method: options.method,
-      headers: options.headers || {},
-      paramsQuery: options.paramsQuery,
-      paramsBody: options.paramsBody
-    });
-  }
-  execInterceptors(response, hasException = false) {
-    var _a;
-    const interceptors = (_a = _RequestService.config) == null ? void 0 : _a.interceptors;
-    if (!(interceptors == null ? void 0 : interceptors.status) || !(interceptors == null ? void 0 : interceptors.error) || !(interceptors == null ? void 0 : interceptors.success) || !(interceptors == null ? void 0 : interceptors.exception)) {
-      throw new Error("\u8BF7\u68C0\u67E5\u62E6\u622A\u5668\u914D\u7F6E");
-    }
-    const status = interceptors.status.exec(response) && !hasException;
-    if (hasException) {
-      interceptors.exception.exec(response);
-    }
-    if (status) {
-      return Promise.resolve(interceptors.success.exec(response));
-    } else {
-      return Promise.reject(interceptors.error.exec(response));
-    }
-  }
-  async send(options, plugins = []) {
-    if (!_RequestService.config) {
-      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
-    }
-    let hasException = false;
-    const adapter = this.getRequestAdapter();
-    this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
-      hasException = true;
-      return adapter.transformException(exception);
-    });
-    if (!hasException) {
-      this.execResponsePlugin("after" /* after */, plugins, options, response);
-    } else {
-      this.execResponsePlugin("catch" /* catch */, plugins, options, response);
-    }
-    return this.execInterceptors(response, hasException);
-  }
-};
-var RequestService = _RequestService;
-__publicField(RequestService, "config");
-__publicField(RequestService, "instance");
-
-// src/adapters/axios.adapter.ts
 var qs = __toESM(require("qs"), 1);
 var _AxiosAdapter = class {
+  config;
+  injectConfig(config) {
+    this.config = config;
+  }
+  /**
+   * 获取Axios实例
+   */
   getAxiosInstance() {
     if (!_AxiosAdapter.axiosInstance) {
       _AxiosAdapter.axiosInstance = import_axios.default.create({
-        timeout: RequestService.config.timeout,
+        timeout: this.config?.timeout,
         headers: {
           "Content-Type": "application/json"
         },
         paramsSerializer: {
           serialize: (params) => qs.stringify(
             params,
-            RequestService.config.qs || {
+            this.config?.qs || {
               arrayFormat: "repeat",
               skipNulls: true,
               allowDots: true,
@@ -153,6 +73,11 @@ var _AxiosAdapter = class {
     }
     return _AxiosAdapter.axiosInstance;
   }
+  /**
+   * 发送请求
+   * @param options 请求参数
+   * @returns AxiosResponse
+   */
   request({
     baseURL,
     pathURL,
@@ -171,6 +96,11 @@ var _AxiosAdapter = class {
       url: pathURL
     });
   }
+  /**
+   * 转换Response
+   * @param response
+   * @returns
+   */
   transformResponse(response) {
     return {
       data: response.data,
@@ -179,13 +109,17 @@ var _AxiosAdapter = class {
       headers: response.headers
     };
   }
+  /**
+   * 转换Response
+   * @param response
+   * @returns
+   */
   transformException(exception) {
-    var _a, _b, _c, _d;
     return {
-      data: ((_a = exception.response) == null ? void 0 : _a.data) || {},
-      statusText: ((_b = exception.response) == null ? void 0 : _b.statusText) || "",
-      status: ((_c = exception.response) == null ? void 0 : _c.status) || 400,
-      headers: ((_d = exception.response) == null ? void 0 : _d.headers) || {}
+      data: exception.response?.data || {},
+      statusText: exception.response?.statusText || "",
+      status: exception.response?.status || 400,
+      headers: exception.response?.headers || {}
     };
   }
 };

package/dist/adapters/index.d.ts

@@ -1,8 +1,11 @@
-import { a as RequestAdapter, b as RequestAdapterOptions, A as AdapterResponse } from '../request-adapter.interface-bd32c0be.js';
+import { c as RequestAdapter, R as RequestSetupConfig, d as RequestAdapterOptions, A as AdapterResponse } from '../request-plugin.interface-70aec02a.js';
 import { AxiosResponse, AxiosError } from 'axios';
+import 'qs';
 
 declare class AxiosAdapter implements RequestAdapter {
     private static axiosInstance;
+    private config;
+    injectConfig(config: RequestSetupConfig): void;
     /**
      * 获取Axios实例
      */

package/dist/adapters/index.js

@@ -1,23 +1,29 @@
 import {
-  RequestService,
   __publicField
-} from "../chunk-WMRFSSUJ.js";
+} from "../chunk-XXPGZHWZ.js";
 
 // src/adapters/axios.adapter.ts
 import axios from "axios";
 import * as qs from "qs";
 var _AxiosAdapter = class {
+  config;
+  injectConfig(config) {
+    this.config = config;
+  }
+  /**
+   * 获取Axios实例
+   */
   getAxiosInstance() {
     if (!_AxiosAdapter.axiosInstance) {
       _AxiosAdapter.axiosInstance = axios.create({
-        timeout: RequestService.config.timeout,
+        timeout: this.config?.timeout,
         headers: {
           "Content-Type": "application/json"
         },
         paramsSerializer: {
           serialize: (params) => qs.stringify(
             params,
-            RequestService.config.qs || {
+            this.config?.qs || {
               arrayFormat: "repeat",
               skipNulls: true,
               allowDots: true,
@@ -30,6 +36,11 @@ var _AxiosAdapter = class {
     }
     return _AxiosAdapter.axiosInstance;
   }
+  /**
+   * 发送请求
+   * @param options 请求参数
+   * @returns AxiosResponse
+   */
   request({
     baseURL,
     pathURL,
@@ -48,6 +59,11 @@ var _AxiosAdapter = class {
       url: pathURL
     });
   }
+  /**
+   * 转换Response
+   * @param response
+   * @returns
+   */
   transformResponse(response) {
     return {
       data: response.data,
@@ -56,13 +72,17 @@ var _AxiosAdapter = class {
       headers: response.headers
     };
   }
+  /**
+   * 转换Response
+   * @param response
+   * @returns
+   */
   transformException(exception) {
-    var _a, _b, _c, _d;
     return {
-      data: ((_a = exception.response) == null ? void 0 : _a.data) || {},
-      statusText: ((_b = exception.response) == null ? void 0 : _b.statusText) || "",
-      status: ((_c = exception.response) == null ? void 0 : _c.status) || 400,
-      headers: ((_d = exception.response) == null ? void 0 : _d.headers) || {}
+      data: exception.response?.data || {},
+      statusText: exception.response?.statusText || "",
+      status: exception.response?.status || 400,
+      headers: exception.response?.headers || {}
     };
   }
 };

package/dist/chunk-XXPGZHWZ.js

@@ -0,0 +1,10 @@
+var __defProp = Object.defineProperty;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __publicField = (obj, key, value) => {
+  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
+  return value;
+};
+
+export {
+  __publicField
+};

package/dist/index.cjs

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
 var __export = (target, all) => {
@@ -16,6 +18,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var __publicField = (obj, key, value) => {
   __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
@@ -26,12 +36,16 @@ var __publicField = (obj, key, value) => {
 var src_exports = {};
 __export(src_exports, {
   PluginLifecycle: () => PluginLifecycle,
+  RequestGenerateType: () => RequestGenerateType,
   RequestMethod: () => RequestMethod,
   RequestService: () => RequestService,
   setup: () => setup
 });
 module.exports = __toCommonJS(src_exports);
 
+// src/request-service.ts
+var import_qs = __toESM(require("qs"), 1);
+
 // src/interfaces/request-plugin.interface.ts
 var PluginLifecycle = /* @__PURE__ */ ((PluginLifecycle2) => {
   PluginLifecycle2["before"] = "before";
@@ -42,24 +56,41 @@ var PluginLifecycle = /* @__PURE__ */ ((PluginLifecycle2) => {
 
 // src/request-service.ts
 var _RequestService = class {
+  /**
+   * 获取服务请求单例
+   */
   static getInstance() {
     if (this.instance) {
       return this.instance;
     }
     return new _RequestService();
   }
+  /**
+   * 获取RequestAdatper
+   * @returns
+   */
   getRequestAdapter() {
     if (!_RequestService.config.adapter) {
       throw new Error("\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E\u8BF7\u6C42Adatper");
     }
     return _RequestService.config.adapter;
   }
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
   execRequestPlugin(plugins = [], options) {
     _RequestService.config.plugins.forEach(
       (service) => service.before && service.before(options)
     );
     plugins.forEach((service) => service.before && service.before(options));
   }
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
   execResponsePlugin(leftcycle, plugins = [], options, response) {
     plugins.forEach((plugin) => {
       const leftcycleFn = plugin[leftcycle];
@@ -70,7 +101,13 @@ var _RequestService = class {
       leftcycleFn && leftcycleFn.bind(plugin)(response, options);
     });
   }
-  parseRequestPath(path, paramsPath) {
+  /**
+   * 转换请求路径
+   */
+  parseRequestPath(path, paramsPath, service) {
+    if (service) {
+      path = `/${service}/${path}`.replace(/\/{2,3}/g, "/");
+    }
     if (paramsPath) {
       return Object.entries(paramsPath).reduce(
         (r, [key, value]) => r.replace(`{${key}}`, value.toString()),
@@ -80,20 +117,34 @@ var _RequestService = class {
       return path;
     }
   }
+  /**
+   * 开始请求
+   * @param adapter
+   * @param options
+   * @returns
+   */
   startRequest(adapter, options) {
     return adapter.request({
       baseURL: _RequestService.config.gateway,
-      pathURL: this.parseRequestPath(options.path, options.paramsPath),
+      pathURL: this.parseRequestPath(
+        options.path,
+        options.paramsPath,
+        options.service
+      ),
       method: options.method,
       headers: options.headers || {},
       paramsQuery: options.paramsQuery,
       paramsBody: options.paramsBody
     });
   }
+  /**
+   * 执行拦截器
+   * @param response 请求响应对象
+   * @returns
+   */
   execInterceptors(response, hasException = false) {
-    var _a;
-    const interceptors = (_a = _RequestService.config) == null ? void 0 : _a.interceptors;
-    if (!(interceptors == null ? void 0 : interceptors.status) || !(interceptors == null ? void 0 : interceptors.error) || !(interceptors == null ? void 0 : interceptors.success) || !(interceptors == null ? void 0 : interceptors.exception)) {
+    const interceptors = _RequestService.config?.interceptors;
+    if (!interceptors?.status || !interceptors?.error || !interceptors?.success || !interceptors?.exception) {
       throw new Error("\u8BF7\u68C0\u67E5\u62E6\u622A\u5668\u914D\u7F6E");
     }
     const status = interceptors.status.exec(response) && !hasException;
@@ -106,6 +157,12 @@ var _RequestService = class {
       return Promise.reject(interceptors.error.exec(response));
     }
   }
+  /**
+   * 发送请求
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns
+   */
   async send(options, plugins = []) {
     if (!_RequestService.config) {
       throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
@@ -124,6 +181,37 @@ var _RequestService = class {
     }
     return this.execInterceptors(response, hasException);
   }
+  /**
+   * 生成请求路径
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns
+   */
+  toURL(options, plugins = []) {
+    if (!_RequestService.config) {
+      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
+    }
+    if (plugins && plugins.length) {
+      this.execRequestPlugin(plugins, options);
+    }
+    const baseURL = _RequestService.config.gateway;
+    const pathURL = this.parseRequestPath(
+      options.path,
+      options.paramsPath,
+      options.service
+    );
+    const queryString = import_qs.default.stringify(
+      options.paramsQuery,
+      _RequestService.config.qs || {
+        arrayFormat: "repeat",
+        skipNulls: true,
+        allowDots: true,
+        encodeValuesOnly: true,
+        encode: true
+      }
+    );
+    return `${baseURL}${pathURL}${queryString}`;
+  }
 };
 var RequestService = _RequestService;
 __publicField(RequestService, "config");
@@ -132,6 +220,7 @@ __publicField(RequestService, "instance");
 // src/request-setup.ts
 function setup(config) {
   RequestService.config = config;
+  RequestService.config?.adapter?.injectConfig?.(config);
 }
 
 // src/interfaces/request-send.interface.ts
@@ -145,9 +234,17 @@ var RequestMethod = /* @__PURE__ */ ((RequestMethod2) => {
   RequestMethod2["Patch"] = "PATCH";
   return RequestMethod2;
 })(RequestMethod || {});
+
+// src/interfaces/request-generate.interface.ts
+var RequestGenerateType = /* @__PURE__ */ ((RequestGenerateType2) => {
+  RequestGenerateType2["Request"] = "TO_REQUEST";
+  RequestGenerateType2["URL"] = "TO_URL";
+  return RequestGenerateType2;
+})(RequestGenerateType || {});
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   PluginLifecycle,
+  RequestGenerateType,
   RequestMethod,
   RequestService,
   setup

package/dist/index.d.ts

@@ -1,40 +1,6 @@
-import { R as RequestSendOptions, A as AdapterResponse, a as RequestAdapter } from './request-adapter.interface-bd32c0be.js';
-export { A as AdapterResponse, a as RequestAdapter, b as RequestAdapterOptions, c as RequestMethod, R as RequestSendOptions } from './request-adapter.interface-bd32c0be.js';
-import { IStringifyOptions } from 'qs';
-
-/**
- * 请求插件
- */
-interface RequestPlugin {
-    before?: (options: RequestSendOptions) => void;
-    after?: (response: AdapterResponse, options: RequestSendOptions) => void;
-    catch?: (response: AdapterResponse, options: RequestSendOptions) => void;
-}
-declare enum PluginLifecycle {
-    before = "before",
-    after = "after",
-    catch = "catch"
-}
-declare type RequestLifecycle = PluginLifecycle.before;
-declare type ResponseLifecycle = PluginLifecycle.after | PluginLifecycle.catch;
-
-interface ResponseInterceptor {
-    exec(response: AdapterResponse): any;
-}
-
-interface RequestSetupConfig {
-    gateway: string;
-    timeout?: number;
-    qs?: IStringifyOptions;
-    adapter?: RequestAdapter;
-    interceptors: {
-        status: ResponseInterceptor;
-        success: ResponseInterceptor;
-        error: ResponseInterceptor;
-        exception: ResponseInterceptor;
-    };
-    plugins: RequestPlugin[];
-}
+import { R as RequestSetupConfig, a as RequestSendOptions, b as RequestPlugin } from './request-plugin.interface-70aec02a.js';
+export { A as AdapterResponse, e as AdapterResponseHeaders, P as PluginLifecycle, c as RequestAdapter, d as RequestAdapterOptions, f as RequestLifecycle, h as RequestMethod, i as ResponseInterceptor, g as ResponseLifecycle } from './request-plugin.interface-70aec02a.js';
+import 'qs';
 
 declare class RequestService {
     static config: RequestSetupConfig;
@@ -84,8 +50,23 @@ declare class RequestService {
      * @returns
      */
     send(options: RequestSendOptions, plugins?: RequestPlugin[]): Promise<any>;
+    /**
+     * 生成请求路径
+     * @param {RequestSendOptions} options 请求选项
+     * @param {RequestPlugin[]} plugins 请求插件
+     * @returns
+     */
+    toURL(options: RequestSendOptions, plugins?: RequestPlugin[]): string;
 }
 
 declare function setup(config: RequestSetupConfig): void;
 
-export { PluginLifecycle, RequestLifecycle, RequestPlugin, RequestService, RequestSetupConfig, ResponseInterceptor, ResponseLifecycle, setup };
+declare enum RequestGenerateType {
+    Request = "TO_REQUEST",
+    URL = "TO_URL"
+}
+interface RequestGenerateOptions {
+    type?: RequestGenerateType;
+}
+
+export { RequestGenerateOptions, RequestGenerateType, RequestPlugin, RequestSendOptions, RequestService, RequestSetupConfig, setup };

package/dist/index.js

@@ -1,11 +1,185 @@
 import {
-  PluginLifecycle,
-  RequestService
-} from "./chunk-WMRFSSUJ.js";
+  __publicField
+} from "./chunk-XXPGZHWZ.js";
+
+// src/request-service.ts
+import qs from "qs";
+
+// src/interfaces/request-plugin.interface.ts
+var PluginLifecycle = /* @__PURE__ */ ((PluginLifecycle2) => {
+  PluginLifecycle2["before"] = "before";
+  PluginLifecycle2["after"] = "after";
+  PluginLifecycle2["catch"] = "catch";
+  return PluginLifecycle2;
+})(PluginLifecycle || {});
+
+// src/request-service.ts
+var _RequestService = class {
+  /**
+   * 获取服务请求单例
+   */
+  static getInstance() {
+    if (this.instance) {
+      return this.instance;
+    }
+    return new _RequestService();
+  }
+  /**
+   * 获取RequestAdatper
+   * @returns
+   */
+  getRequestAdapter() {
+    if (!_RequestService.config.adapter) {
+      throw new Error("\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E\u8BF7\u6C42Adatper");
+    }
+    return _RequestService.config.adapter;
+  }
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
+  execRequestPlugin(plugins = [], options) {
+    _RequestService.config.plugins.forEach(
+      (service) => service.before && service.before(options)
+    );
+    plugins.forEach((service) => service.before && service.before(options));
+  }
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
+  execResponsePlugin(leftcycle, plugins = [], options, response) {
+    plugins.forEach((plugin) => {
+      const leftcycleFn = plugin[leftcycle];
+      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
+    });
+    _RequestService.config.plugins.forEach((plugin) => {
+      const leftcycleFn = plugin[leftcycle];
+      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
+    });
+  }
+  /**
+   * 转换请求路径
+   */
+  parseRequestPath(path, paramsPath, service) {
+    if (service) {
+      path = `/${service}/${path}`.replace(/\/{2,3}/g, "/");
+    }
+    if (paramsPath) {
+      return Object.entries(paramsPath).reduce(
+        (r, [key, value]) => r.replace(`{${key}}`, value.toString()),
+        path
+      );
+    } else {
+      return path;
+    }
+  }
+  /**
+   * 开始请求
+   * @param adapter
+   * @param options
+   * @returns
+   */
+  startRequest(adapter, options) {
+    return adapter.request({
+      baseURL: _RequestService.config.gateway,
+      pathURL: this.parseRequestPath(
+        options.path,
+        options.paramsPath,
+        options.service
+      ),
+      method: options.method,
+      headers: options.headers || {},
+      paramsQuery: options.paramsQuery,
+      paramsBody: options.paramsBody
+    });
+  }
+  /**
+   * 执行拦截器
+   * @param response 请求响应对象
+   * @returns
+   */
+  execInterceptors(response, hasException = false) {
+    const interceptors = _RequestService.config?.interceptors;
+    if (!interceptors?.status || !interceptors?.error || !interceptors?.success || !interceptors?.exception) {
+      throw new Error("\u8BF7\u68C0\u67E5\u62E6\u622A\u5668\u914D\u7F6E");
+    }
+    const status = interceptors.status.exec(response) && !hasException;
+    if (hasException) {
+      interceptors.exception.exec(response);
+    }
+    if (status) {
+      return Promise.resolve(interceptors.success.exec(response));
+    } else {
+      return Promise.reject(interceptors.error.exec(response));
+    }
+  }
+  /**
+   * 发送请求
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns
+   */
+  async send(options, plugins = []) {
+    if (!_RequestService.config) {
+      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
+    }
+    let hasException = false;
+    const adapter = this.getRequestAdapter();
+    this.execRequestPlugin(plugins, options);
+    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
+      hasException = true;
+      return adapter.transformException(exception);
+    });
+    if (!hasException) {
+      this.execResponsePlugin("after" /* after */, plugins, options, response);
+    } else {
+      this.execResponsePlugin("catch" /* catch */, plugins, options, response);
+    }
+    return this.execInterceptors(response, hasException);
+  }
+  /**
+   * 生成请求路径
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns
+   */
+  toURL(options, plugins = []) {
+    if (!_RequestService.config) {
+      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
+    }
+    if (plugins && plugins.length) {
+      this.execRequestPlugin(plugins, options);
+    }
+    const baseURL = _RequestService.config.gateway;
+    const pathURL = this.parseRequestPath(
+      options.path,
+      options.paramsPath,
+      options.service
+    );
+    const queryString = qs.stringify(
+      options.paramsQuery,
+      _RequestService.config.qs || {
+        arrayFormat: "repeat",
+        skipNulls: true,
+        allowDots: true,
+        encodeValuesOnly: true,
+        encode: true
+      }
+    );
+    return `${baseURL}${pathURL}${queryString}`;
+  }
+};
+var RequestService = _RequestService;
+__publicField(RequestService, "config");
+__publicField(RequestService, "instance");
 
 // src/request-setup.ts
 function setup(config) {
   RequestService.config = config;
+  RequestService.config?.adapter?.injectConfig?.(config);
 }
 
 // src/interfaces/request-send.interface.ts
@@ -19,8 +193,16 @@ var RequestMethod = /* @__PURE__ */ ((RequestMethod2) => {
   RequestMethod2["Patch"] = "PATCH";
   return RequestMethod2;
 })(RequestMethod || {});
+
+// src/interfaces/request-generate.interface.ts
+var RequestGenerateType = /* @__PURE__ */ ((RequestGenerateType2) => {
+  RequestGenerateType2["Request"] = "TO_REQUEST";
+  RequestGenerateType2["URL"] = "TO_URL";
+  return RequestGenerateType2;
+})(RequestGenerateType || {});
 export {
   PluginLifecycle,
+  RequestGenerateType,
   RequestMethod,
   RequestService,
   setup

package/dist/request-plugin.interface-70aec02a.d.ts

@@ -0,0 +1,97 @@
+import { IStringifyOptions } from 'qs';
+
+/**
+ * 请求方法类型
+ */
+declare enum RequestMethod {
+    Get = "GET",
+    Post = "POST",
+    Put = "PUT",
+    Delete = "DELETE",
+    Options = "OPTIONS",
+    Head = "HEAD",
+    Patch = "PATCH"
+}
+interface RequestSendOptions {
+    service?: string;
+    path: string;
+    method: RequestMethod | string;
+    headers?: Record<string, string>;
+    paramsPath?: Record<string, string | number>;
+    paramsQuery?: Record<string, any>;
+    paramsBody?: any;
+}
+
+interface ResponseInterceptor {
+    exec(response: AdapterResponse): any;
+}
+
+interface RequestSetupConfig {
+    gateway: string;
+    timeout?: number;
+    qs?: IStringifyOptions;
+    adapter?: RequestAdapter;
+    interceptors: {
+        status: ResponseInterceptor;
+        success: ResponseInterceptor;
+        error: ResponseInterceptor;
+        exception: ResponseInterceptor;
+    };
+    plugins: RequestPlugin[];
+}
+
+interface RequestAdapter {
+    /**
+     *  注入全局配置文件
+     * @param config
+     * @returns
+     */
+    injectConfig?: (config: RequestSetupConfig) => void;
+    /**
+     * 发送请求
+     */
+    request(options: RequestAdapterOptions): Promise<any>;
+    /**
+     * 转换Response
+     * @param any
+     */
+    transformResponse(response: any): AdapterResponse;
+    /**
+     * 转换Exception
+     * @param any
+     */
+    transformException(response: any): AdapterResponse;
+}
+interface RequestAdapterOptions {
+    baseURL: string;
+    pathURL: string;
+    headers: Record<string, string>;
+    method: RequestMethod | string;
+    paramsQuery?: Record<string, any>;
+    paramsBody?: any;
+}
+interface AdapterResponse {
+    data: Record<string, any>;
+    status: number;
+    statusText: string;
+    headers: AdapterResponseHeaders;
+}
+type AdapterResponseHeaders = Record<string, string | string[] | number | boolean | undefined>;
+
+/**
+ * 请求插件
+ */
+interface RequestPlugin {
+    before?: (options: RequestSendOptions) => void;
+    after?: (response: AdapterResponse, options: RequestSendOptions) => void;
+    catch?: (response: AdapterResponse, options: RequestSendOptions) => void;
+}
+declare enum PluginLifecycle {
+    before = "before",
+    after = "after",
+    catch = "catch"
+}
+type RequestLifecycle = PluginLifecycle.before;
+type ResponseLifecycle = PluginLifecycle.after | PluginLifecycle.catch;
+
+export { AdapterResponse as A, PluginLifecycle as P, RequestSetupConfig as R, RequestSendOptions as a, RequestPlugin as b, RequestAdapter as c, RequestAdapterOptions as d, AdapterResponseHeaders as e, RequestLifecycle as f, ResponseLifecycle as g, RequestMethod as h, ResponseInterceptor as i };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@gopowerteam/request",
   "private": false,
-  "version": "0.1.10",
+  "version": "0.1.12",
   "type": "module",
   "files": [
     "dist",
@@ -28,18 +28,17 @@
     }
   },
   "devDependencies": {
-    "@types/axios": "^0.14.0",
-    "@types/jest": "^29.1.2",
-    "@types/node": "16",
+    "@types/jest": "^29.4.0",
+    "@types/node": "18",
     "@types/qs": "^6.9.7",
-    "jest": "^29.1.2",
-    "ts-jest": "^29.0.3",
+    "jest": "^29.4.3",
+    "ts-jest": "^29.0.5",
     "ts-node": "^10.9.1",
-    "tsup": "^6.2.3",
-    "typescript": "^4.8.4"
+    "tsup": "^6.6.3",
+    "typescript": "^4.9.5"
   },
   "dependencies": {
-    "axios": "^1.1.2",
+    "axios": "^1.3.4",
     "qs": "^6.11.0"
   },
   "scripts": {

package/dist/chunk-WMRFSSUJ.js

@@ -1,109 +0,0 @@
-var __defProp = Object.defineProperty;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __publicField = (obj, key, value) => {
-  __defNormalProp(obj, typeof key !== "symbol" ? key + "" : key, value);
-  return value;
-};
-
-// src/interfaces/request-plugin.interface.ts
-var PluginLifecycle = /* @__PURE__ */ ((PluginLifecycle2) => {
-  PluginLifecycle2["before"] = "before";
-  PluginLifecycle2["after"] = "after";
-  PluginLifecycle2["catch"] = "catch";
-  return PluginLifecycle2;
-})(PluginLifecycle || {});
-
-// src/request-service.ts
-var _RequestService = class {
-  static getInstance() {
-    if (this.instance) {
-      return this.instance;
-    }
-    return new _RequestService();
-  }
-  getRequestAdapter() {
-    if (!_RequestService.config.adapter) {
-      throw new Error("\u8BF7\u68C0\u67E5\u662F\u5426\u914D\u7F6E\u8BF7\u6C42Adatper");
-    }
-    return _RequestService.config.adapter;
-  }
-  execRequestPlugin(plugins = [], options) {
-    _RequestService.config.plugins.forEach(
-      (service) => service.before && service.before(options)
-    );
-    plugins.forEach((service) => service.before && service.before(options));
-  }
-  execResponsePlugin(leftcycle, plugins = [], options, response) {
-    plugins.forEach((plugin) => {
-      const leftcycleFn = plugin[leftcycle];
-      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
-    });
-    _RequestService.config.plugins.forEach((plugin) => {
-      const leftcycleFn = plugin[leftcycle];
-      leftcycleFn && leftcycleFn.bind(plugin)(response, options);
-    });
-  }
-  parseRequestPath(path, paramsPath) {
-    if (paramsPath) {
-      return Object.entries(paramsPath).reduce(
-        (r, [key, value]) => r.replace(`{${key}}`, value.toString()),
-        path
-      );
-    } else {
-      return path;
-    }
-  }
-  startRequest(adapter, options) {
-    return adapter.request({
-      baseURL: _RequestService.config.gateway,
-      pathURL: this.parseRequestPath(options.path, options.paramsPath),
-      method: options.method,
-      headers: options.headers || {},
-      paramsQuery: options.paramsQuery,
-      paramsBody: options.paramsBody
-    });
-  }
-  execInterceptors(response, hasException = false) {
-    var _a;
-    const interceptors = (_a = _RequestService.config) == null ? void 0 : _a.interceptors;
-    if (!(interceptors == null ? void 0 : interceptors.status) || !(interceptors == null ? void 0 : interceptors.error) || !(interceptors == null ? void 0 : interceptors.success) || !(interceptors == null ? void 0 : interceptors.exception)) {
-      throw new Error("\u8BF7\u68C0\u67E5\u62E6\u622A\u5668\u914D\u7F6E");
-    }
-    const status = interceptors.status.exec(response) && !hasException;
-    if (hasException) {
-      interceptors.exception.exec(response);
-    }
-    if (status) {
-      return Promise.resolve(interceptors.success.exec(response));
-    } else {
-      return Promise.reject(interceptors.error.exec(response));
-    }
-  }
-  async send(options, plugins = []) {
-    if (!_RequestService.config) {
-      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
-    }
-    let hasException = false;
-    const adapter = this.getRequestAdapter();
-    this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options).then((response2) => adapter.transformResponse(response2)).catch((exception) => {
-      hasException = true;
-      return adapter.transformException(exception);
-    });
-    if (!hasException) {
-      this.execResponsePlugin("after" /* after */, plugins, options, response);
-    } else {
-      this.execResponsePlugin("catch" /* catch */, plugins, options, response);
-    }
-    return this.execInterceptors(response, hasException);
-  }
-};
-var RequestService = _RequestService;
-__publicField(RequestService, "config");
-__publicField(RequestService, "instance");
-
-export {
-  __publicField,
-  PluginLifecycle,
-  RequestService
-};

package/dist/request-adapter.interface-bd32c0be.d.ts

@@ -1,53 +0,0 @@
-/**
- * 请求方法类型
- */
-declare enum RequestMethod {
-    Get = "GET",
-    Post = "POST",
-    Put = "PUT",
-    Delete = "DELETE",
-    Options = "OPTIONS",
-    Head = "HEAD",
-    Patch = "PATCH"
-}
-interface RequestSendOptions {
-    path: string;
-    method: RequestMethod | string;
-    headers?: Record<string, string>;
-    paramsPath?: Record<string, string | number>;
-    paramsQuery?: Record<string, any>;
-    paramsBody?: any;
-}
-
-interface RequestAdapter {
-    /**
-     * 发送请求
-     */
-    request(options: RequestAdapterOptions): Promise<any>;
-    /**
-     * 转换Response
-     * @param any
-     */
-    transformResponse(response: any): AdapterResponse;
-    /**
-     * 转换Exception
-     * @param any
-     */
-    transformException(response: any): AdapterResponse;
-}
-interface RequestAdapterOptions {
-    baseURL: string;
-    pathURL: string;
-    headers: Record<string, string>;
-    method: RequestMethod | string;
-    paramsQuery?: Record<string, any>;
-    paramsBody?: any;
-}
-interface AdapterResponse {
-    data: Record<string, any>;
-    status: number;
-    statusText: string;
-    headers: Record<string, string | string[] | undefined>;
-}
-
-export { AdapterResponse as A, RequestSendOptions as R, RequestAdapter as a, RequestAdapterOptions as b, RequestMethod as c };