@gopowerteam/request 0.1.20 → 0.2.0

package/dist/index.cjs

@@ -1,268 +1,250 @@
-"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) => {
-  for (var name in all)
-    __defProp(target, name, { get: all[name], enumerable: true });
-};
-var __copyProps = (to, from, except, desc) => {
-  if (from && typeof from === "object" || typeof from === "function") {
-    for (let key of __getOwnPropNames(from))
-      if (!__hasOwnProp.call(to, key) && key !== except)
-        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
-  }
-  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);
-  return value;
-};
+Object.defineProperty(exports, Symbol.toStringTag, { value: 'Module' });
 
-// src/index.ts
-var src_exports = {};
-__export(src_exports, {
-  PluginLifecycle: () => PluginLifecycle,
-  RequestGenerateType: () => RequestGenerateType,
-  RequestMethod: () => RequestMethod,
-  RequestService: () => RequestService,
-  setup: () => setup
-});
-module.exports = __toCommonJS(src_exports);
+//#region src/interfaces/request-generate.interface.ts
+let RequestGenerateType = /* @__PURE__ */ function(RequestGenerateType) {
+	RequestGenerateType["Request"] = "TO_REQUEST";
+	RequestGenerateType["URL"] = "TO_URL";
+	return RequestGenerateType;
+}({});
 
-// src/request-service.ts
-var import_qs = __toESM(require("qs"), 1);
+//#endregion
+//#region src/interfaces/request-plugin.interface.ts
+let PluginLifecycle = /* @__PURE__ */ function(PluginLifecycle) {
+	PluginLifecycle["before"] = "before";
+	PluginLifecycle["after"] = "after";
+	PluginLifecycle["catch"] = "catch";
+	return PluginLifecycle;
+}({});
 
-// src/interfaces/request-plugin.interface.ts
-var PluginLifecycle = /* @__PURE__ */ ((PluginLifecycle2) => {
-  PluginLifecycle2["before"] = "before";
-  PluginLifecycle2["after"] = "after";
-  PluginLifecycle2["catch"] = "catch";
-  return PluginLifecycle2;
-})(PluginLifecycle || {});
+//#endregion
+//#region src/interfaces/request-send.interface.ts
+/**
+* 请求方法类型
+*/
+let RequestMethod = /* @__PURE__ */ function(RequestMethod) {
+	RequestMethod["Get"] = "GET";
+	RequestMethod["Post"] = "POST";
+	RequestMethod["Put"] = "PUT";
+	RequestMethod["Delete"] = "DELETE";
+	RequestMethod["Options"] = "OPTIONS";
+	RequestMethod["Head"] = "HEAD";
+	RequestMethod["Patch"] = "PATCH";
+	return RequestMethod;
+}({});
 
-// 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
-   */
-  async execRequestPlugin(plugins = [], options) {
-    const extraParams = {};
-    const appendParams = (params) => {
-      Object.assign(extraParams, params || {});
-    };
-    for (const plugin of _RequestService.config.plugins) {
-      if (plugin.before) {
-        await plugin.before(options, appendParams);
-      }
-    }
-    for (const plugin of plugins) {
-      if (plugin.before) {
-        await plugin.before(options, appendParams);
-      }
-    }
-    return extraParams;
-  }
-  /**
-   * 执行前置插件逻辑
-   * @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, extraParams) {
-    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,
-      extraParams
-    });
-  }
-  /**
-   * 执行拦截器
-   * @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, requestPlugins = []) {
-    if (!_RequestService.config) {
-      throw new Error("\u8BF7\u68C0\u67E5\u8BF7\u6C42\u914D\u7F6E\u662F\u5426\u5B8C\u6210");
-    }
-    let hasException = false;
-    const adapter = this.getRequestAdapter();
-    const plugins = requestPlugins.filter(Boolean);
-    const extraParams = await this.execRequestPlugin(plugins, options);
-    const response = await this.startRequest(adapter, options, extraParams).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.filter(Boolean),
-        options
-      );
-    }
-    const baseURL = _RequestService.config.gateway;
-    const pathURL = this.parseRequestPath(
-      options.path,
-      options.paramsPath,
-      options.service
-    );
-    const queryString = import_qs.default.stringify(options.paramsQuery, {
-      ...{
-        arrayFormat: "repeat",
-        skipNulls: true,
-        allowDots: true,
-        encodeValuesOnly: true,
-        encode: true
-      },
-      ..._RequestService.config.qs || {},
-      addQueryPrefix: true
-    });
-    return `${baseURL}${pathURL}${queryString}`;
-  }
+//#endregion
+//#region src/utils/query-string.ts
+/**
+* 编码字符串
+*/
+function encodeValue(value, encode) {
+	if (!encode) return value;
+	return encodeURIComponent(value);
+}
+/**
+* 处理嵌套对象的键名
+*/
+function getKeyWithDot(key, childKey, allowDots) {
+	return allowDots ? `${key}.${childKey}` : `${key}[${childKey}]`;
+}
+/**
+* 递归处理对象值
+*/
+function processValue(value, options, parentKey = "") {
+	const result = [];
+	if (value === null || value === void 0) {
+		if (!options.skipNulls) result.push(`${parentKey}=`);
+		return result;
+	}
+	if (Array.isArray(value)) if (options.arrayFormat === "comma") {
+		const filteredValues = value.filter((item) => item !== null && item !== void 0);
+		if (filteredValues.length > 0) {
+			const encodedValue = encodeValue(filteredValues.map((item) => typeof item === "object" ? JSON.stringify(item) : item.toString()).join(","), options.encode !== false);
+			result.push(`${parentKey}=${encodedValue}`);
+		}
+	} else value.forEach((item, index) => {
+		let itemKey;
+		const shouldEncode = options.encode !== false;
+		if (options.arrayFormat === "indices") itemKey = parentKey ? `${parentKey}[${index}]` : `[${index}]`;
+		else if (options.arrayFormat === "brackets") itemKey = parentKey ? `${parentKey}[]` : "[]";
+		else itemKey = parentKey;
+		if (typeof item === "object" && item !== null) result.push(...processValue(item, options, itemKey));
+		else {
+			const encodedValue = encodeValue(item.toString(), shouldEncode);
+			result.push(`${itemKey}=${encodedValue}`);
+		}
+	});
+	else if (typeof value === "object") Object.keys(value).forEach((childKey) => {
+		const fullKey = parentKey ? getKeyWithDot(parentKey, childKey, options.allowDots || false) : childKey;
+		result.push(...processValue(value[childKey], options, fullKey));
+	});
+	else {
+		const shouldEncode = options.encode !== false;
+		const encodedValue = encodeValue(value.toString(), shouldEncode);
+		const encodedKey = options.encodeValuesOnly ? parentKey : encodeValue(parentKey, shouldEncode);
+		result.push(`${encodedKey}=${encodedValue}`);
+	}
+	return result;
+}
+/**
+* 将对象序列化为查询字符串
+*/
+function stringify(obj, options = {}) {
+	const { arrayFormat = "indices", skipNulls = true, allowDots = true, encodeValuesOnly = false, encode = true, addQueryPrefix = false } = options;
+	if (!obj || typeof obj !== "object") return options.addQueryPrefix ? "?" : "";
+	const parts = [];
+	Object.keys(obj).forEach((key) => {
+		const value = obj[key];
+		const processedValues = processValue(value, {
+			arrayFormat,
+			skipNulls,
+			allowDots,
+			encodeValuesOnly,
+			encode,
+			addQueryPrefix
+		}, key);
+		parts.push(...processedValues);
+	});
+	const queryString = parts.join("&");
+	return addQueryPrefix ? queryString ? `?${queryString}` : "?" : queryString;
+}
+
+//#endregion
+//#region src/request-service.ts
+var RequestService = class RequestService {
+	static config;
+	static instance;
+	/**
+	* 获取服务请求单例
+	*/
+	static getInstance() {
+		if (this.instance) return this.instance;
+		return new RequestService();
+	}
+	/**
+	* 获取RequestAdatper
+	* @returns RequestAdapter
+	*/
+	getRequestAdapter() {
+		if (!RequestService.config.adapter) throw new Error("请检查是否配置请求Adatper");
+		return RequestService.config.adapter;
+	}
+	/**
+	* 执行前置插件逻辑
+	* @param plugins
+	* @param options
+	*/
+	async execRequestPlugin(plugins = [], options) {
+		const extraParams = {};
+		const appendParams = (params) => {
+			Object.assign(extraParams, params || {});
+		};
+		for (const plugin of RequestService.config.plugins) if (plugin.before) await plugin.before(options, appendParams);
+		for (const plugin of plugins) if (plugin.before) await plugin.before(options, appendParams);
+		return extraParams;
+	}
+	/**
+	* 执行前置插件逻辑
+	*/
+	execResponsePlugin(leftcycle, plugins = [], options, response) {
+		plugins.forEach((plugin) => {
+			const leftcycleFn = plugin[leftcycle];
+			if (leftcycleFn) leftcycleFn.bind(plugin)(response, options);
+		});
+		RequestService.config.plugins.forEach((plugin) => {
+			const leftcycleFn = plugin[leftcycle];
+			if (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  Promise
+	*/
+	startRequest(adapter, options, extraParams) {
+		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,
+			extraParams
+		});
+	}
+	/**
+	* 执行拦截器
+	* @param response 请求响应对象
+	* @returns Promise
+	*/
+	execInterceptors(response, hasException = false) {
+		const interceptors = RequestService.config?.interceptors;
+		if (!interceptors?.status || !interceptors?.error || !interceptors?.success || !interceptors?.exception) throw new Error("请检查拦截器配置");
+		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[]} requestPlugins 请求插件
+	* @returns Promise
+	*/
+	async send(options, requestPlugins = []) {
+		if (!RequestService.config) throw new Error("请检查请求配置是否完成");
+		let hasException = false;
+		const adapter = this.getRequestAdapter();
+		const plugins = requestPlugins.filter(Boolean);
+		const extraParams = await this.execRequestPlugin(plugins, options);
+		const response = await this.startRequest(adapter, options, extraParams).then((response) => adapter.transformResponse(response)).catch((exception) => {
+			hasException = true;
+			return adapter.transformException(exception);
+		});
+		if (!hasException) this.execResponsePlugin(PluginLifecycle.after, plugins, options, response);
+		else this.execResponsePlugin(PluginLifecycle.catch, plugins, options, response);
+		return this.execInterceptors(response, hasException);
+	}
+	/**
+	* 生成请求路径
+	* @param {RequestSendOptions} options 请求选项
+	* @param {RequestPlugin[]} plugins 请求插件
+	* @returns string
+	*/
+	toURL(options, plugins = []) {
+		if (!RequestService.config) throw new Error("请检查请求配置是否完成");
+		if (plugins && plugins.length) this.execRequestPlugin(plugins.filter(Boolean), options);
+		return `${RequestService.config.gateway}${this.parseRequestPath(options.path, options.paramsPath, options.service)}${stringify(options.paramsQuery || {}, {
+			arrayFormat: "repeat",
+			skipNulls: true,
+			allowDots: true,
+			encodeValuesOnly: true,
+			encode: true,
+			addQueryPrefix: true,
+			...RequestService.config.qs || {}
+		})}`;
+	}
 };
-var RequestService = _RequestService;
-__publicField(RequestService, "config");
-__publicField(RequestService, "instance");
 
-// src/request-setup.ts
+//#endregion
+//#region src/request-setup.ts
 function setup(config) {
-  RequestService.config = config;
-  RequestService.config?.adapter?.injectConfig?.(config);
+	RequestService.config = config;
+	RequestService.config?.adapter?.injectConfig?.(config);
 }
 
-// src/interfaces/request-send.interface.ts
-var RequestMethod = /* @__PURE__ */ ((RequestMethod2) => {
-  RequestMethod2["Get"] = "GET";
-  RequestMethod2["Post"] = "POST";
-  RequestMethod2["Put"] = "PUT";
-  RequestMethod2["Delete"] = "DELETE";
-  RequestMethod2["Options"] = "OPTIONS";
-  RequestMethod2["Head"] = "HEAD";
-  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
-});
+//#endregion
+exports.PluginLifecycle = PluginLifecycle;
+exports.RequestGenerateType = RequestGenerateType;
+exports.RequestMethod = RequestMethod;
+exports.RequestService = RequestService;
+exports.setup = setup;

package/dist/index.d.cts

@@ -0,0 +1,71 @@
+import { a as RequestSetupConfig, c as RequestLifecycle, d as RequestMethod, f as RequestSendOptions, i as RequestAdapterOptions, l as RequestPlugin, n as AdapterResponseHeaders, o as ResponseInterceptor, r as RequestAdapter, s as PluginLifecycle, t as AdapterResponse, u as ResponseLifecycle } from "./request-adapter.interface-Cr5s4kIp.cjs";
+
+//#region src/interfaces/request-generate.interface.d.ts
+declare enum RequestGenerateType {
+  Request = "TO_REQUEST",
+  URL = "TO_URL"
+}
+interface RequestGenerateOptions {
+  type?: RequestGenerateType;
+}
+//#endregion
+//#region src/request-service.d.ts
+declare class RequestService {
+  static config: RequestSetupConfig;
+  static instance: RequestService;
+  /**
+   * 获取服务请求单例
+   */
+  static getInstance(): RequestService;
+  /**
+   * 获取RequestAdatper
+   * @returns RequestAdapter
+   */
+  private getRequestAdapter;
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
+  private execRequestPlugin;
+  /**
+   * 执行前置插件逻辑
+   */
+  private execResponsePlugin;
+  /**
+   * 转换请求路径
+   */
+  private parseRequestPath;
+  /**
+   * 开始请求
+   * @param adapter
+   * @param options
+   * @returns  Promise
+   */
+  private startRequest;
+  /**
+   * 执行拦截器
+   * @param response 请求响应对象
+   * @returns Promise
+   */
+  private execInterceptors;
+  /**
+   * 发送请求
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} requestPlugins 请求插件
+   * @returns Promise
+   */
+  send(options: RequestSendOptions, requestPlugins?: (RequestPlugin | undefined)[]): Promise<any>;
+  /**
+   * 生成请求路径
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns string
+   */
+  toURL(options: RequestSendOptions, plugins?: (RequestPlugin | undefined)[]): string;
+}
+//#endregion
+//#region src/request-setup.d.ts
+declare function setup(config: RequestSetupConfig): void;
+//#endregion
+export { AdapterResponse, AdapterResponseHeaders, PluginLifecycle, RequestAdapter, RequestAdapterOptions, RequestGenerateOptions, RequestGenerateType, RequestLifecycle, RequestMethod, RequestPlugin, RequestSendOptions, RequestService, RequestSetupConfig, ResponseInterceptor, ResponseLifecycle, setup };

package/dist/index.d.mts

@@ -0,0 +1,62 @@
+import { a as RequestAdapter, c as ResponseInterceptor, d as RequestPlugin, f as ResponseLifecycle, i as AdapterResponseHeaders, l as PluginLifecycle, m as RequestSendOptions, n as RequestGenerateType, o as RequestAdapterOptions, p as RequestMethod, r as AdapterResponse, s as RequestSetupConfig, t as RequestGenerateOptions, u as RequestLifecycle } from "./index-hNav9Ikc.mjs";
+
+//#region src/request-service.d.ts
+declare class RequestService {
+  static config: RequestSetupConfig;
+  static instance: RequestService;
+  /**
+   * 获取服务请求单例
+   */
+  static getInstance(): RequestService;
+  /**
+   * 获取RequestAdatper
+   * @returns RequestAdapter
+   */
+  private getRequestAdapter;
+  /**
+   * 执行前置插件逻辑
+   * @param plugins
+   * @param options
+   */
+  private execRequestPlugin;
+  /**
+   * 执行前置插件逻辑
+   */
+  private execResponsePlugin;
+  /**
+   * 转换请求路径
+   */
+  private parseRequestPath;
+  /**
+   * 开始请求
+   * @param adapter
+   * @param options
+   * @returns  Promise
+   */
+  private startRequest;
+  /**
+   * 执行拦截器
+   * @param response 请求响应对象
+   * @returns Promise
+   */
+  private execInterceptors;
+  /**
+   * 发送请求
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} requestPlugins 请求插件
+   * @returns Promise
+   */
+  send(options: RequestSendOptions, requestPlugins?: (RequestPlugin | undefined)[]): Promise<any>;
+  /**
+   * 生成请求路径
+   * @param {RequestSendOptions} options 请求选项
+   * @param {RequestPlugin[]} plugins 请求插件
+   * @returns string
+   */
+  toURL(options: RequestSendOptions, plugins?: (RequestPlugin | undefined)[]): string;
+}
+//#endregion
+//#region src/request-setup.d.ts
+declare function setup(config: RequestSetupConfig): void;
+//#endregion
+export { AdapterResponse, AdapterResponseHeaders, PluginLifecycle, RequestAdapter, RequestAdapterOptions, RequestGenerateOptions, RequestGenerateType, RequestLifecycle, RequestMethod, RequestPlugin, RequestSendOptions, RequestService, RequestSetupConfig, ResponseInterceptor, ResponseLifecycle, setup };