@qlover/fe-corekit 3.1.0 → 3.1.1

package/dist/index.cjs

@@ -3981,6 +3981,7 @@ var SimpleUrlBuilder = class {
 };
 
 // src/request/impl/RequestPlugin.ts
+var import_lodash_es4 = require("lodash-es");
 var RequestPlugin = class {
   pluginName = "RequestPlugin";
   config;
@@ -4035,13 +4036,23 @@ var RequestPlugin = class {
    * @override
    */
   onBefore(ctx) {
-    const mergedConfig = this.mergeConfig(ctx.parameters);
+    ctx.setParameters(this.mergeConfig(ctx.parameters));
+  }
+  /**
+   * Main request handler
+   *
+   * This is the core of the plugin. It merges default plugin configuration with request context configuration,
+   * processes request data, builds the URL, and injects headers.
+   *
+   * @param config - Request configuration
+   * @returns Merged configuration with processed data, built URL, and injected headers
+   */
+  mergeConfig(config) {
+    const mergedConfig = this.createConfig(config);
     const processedData = this.processRequestData(mergedConfig);
     const builtUrl = this.buildUrl(mergedConfig);
     const injectedHeaders = this.injectHeaders(mergedConfig);
-    ctx.setParameters({
-      ...ctx.parameters,
-      ...mergedConfig,
+    return Object.assign(mergedConfig, {
       data: processedData,
       url: builtUrl,
       headers: injectedHeaders
@@ -4059,8 +4070,8 @@ var RequestPlugin = class {
    * @param contextConfig - Configuration from request context
    * @returns Merged configuration
    */
-  mergeConfig(contextConfig) {
-    const merged = { ...this.config, ...contextConfig };
+  createConfig(contextConfig) {
+    const merged = Object.assign((0, import_lodash_es4.clone)(this.config), contextConfig);
     if (!("data" in contextConfig) && "data" in this.config) {
       merged.data = this.config.data;
     }
@@ -4074,13 +4085,10 @@ var RequestPlugin = class {
    * @throws {Error} If the built URL is empty or invalid
    */
   buildUrl(config) {
-    const url = this.urlBuilder.buildUrl(config);
-    if (!url || url.trim() === "") {
-      throw new Error(
-        `RequestPlugin: Invalid URL. URL cannot be empty. baseURL: ${config.baseURL ?? "undefined"}, url: ${config.url ?? "undefined"}`
-      );
+    if (config.allowEmptyUrl === false && !config.url && !config.baseURL) {
+      throw new Error("Empty URL is not allowed");
     }
-    return url;
+    return this.urlBuilder.buildUrl(config);
   }
   /**
    * Inject default headers into request configuration
@@ -4134,7 +4142,7 @@ var RequestPlugin = class {
 };
 
 // src/request/impl/ResponsePlugin.ts
-var import_lodash_es4 = require("lodash-es");
+var import_lodash_es5 = require("lodash-es");
 
 // src/request/utils/isRequestAdapterResponse.ts
 function isRequestAdapterResponse(value) {
@@ -4215,18 +4223,17 @@ var ResponsePlugin = class {
   async onSuccess(context) {
     const returnValue = context.returnValue;
     const config = context.parameters;
+    const result = await this.handleResponse(returnValue, config);
+    if (result) {
+      context.setReturnValue(result);
+    }
+  }
+  handleResponse(returnValue, config) {
     if (returnValue instanceof Response) {
-      const processedResponse = await this.processResponse(returnValue, config);
-      context.setReturnValue(processedResponse);
-      return;
+      return this.processResponse(returnValue, config);
     }
     if (isRequestAdapterResponse(returnValue)) {
-      const processedResponse = await this.processAdapterResponse(
-        returnValue,
-        config
-      );
-      context.setReturnValue(processedResponse);
-      return;
+      return this.processAdapterResponse(returnValue, config);
     }
   }
   /**
@@ -4298,7 +4305,7 @@ var ResponsePlugin = class {
    * ```
    */
   async parseResponseData(response, responseType) {
-    if ((0, import_lodash_es4.isFunction)(this.config.responseDataParser)) {
+    if ((0, import_lodash_es5.isFunction)(this.config.responseDataParser)) {
       return await this.config.responseDataParser(response, responseType);
     }
     return await this.defaultParseResponseData(response, responseType);
@@ -4322,7 +4329,7 @@ var ResponsePlugin = class {
     if (parser === false) {
       return response;
     }
-    if ((0, import_lodash_es4.isFunction)(parser)) {
+    if ((0, import_lodash_es5.isFunction)(parser)) {
       return await parser(response);
     }
     return await this.fallbackParseByContentType(response, normalizedType);
@@ -4340,13 +4347,13 @@ var ResponsePlugin = class {
     const lowerContentType = contentType.toLowerCase();
     if (lowerContentType.includes("application/json")) {
       const jsonParser = this.parsers.json;
-      if ((0, import_lodash_es4.isFunction)(jsonParser)) {
+      if ((0, import_lodash_es5.isFunction)(jsonParser)) {
         return jsonParser;
       }
     }
     if (lowerContentType.includes("text/") || lowerContentType.includes("application/xml") || lowerContentType.includes("application/xhtml")) {
       const textParser = this.parsers.text;
-      if ((0, import_lodash_es4.isFunction)(textParser)) {
+      if ((0, import_lodash_es5.isFunction)(textParser)) {
         return textParser;
       }
     }
@@ -4363,11 +4370,11 @@ var ResponsePlugin = class {
   getFallbackParsers() {
     const fallbackParsers = [];
     const jsonParser = this.parsers.json;
-    if ((0, import_lodash_es4.isFunction)(jsonParser)) {
+    if ((0, import_lodash_es5.isFunction)(jsonParser)) {
       fallbackParsers.push(jsonParser);
     }
     const textParser = this.parsers.text;
-    if ((0, import_lodash_es4.isFunction)(textParser)) {
+    if ((0, import_lodash_es5.isFunction)(textParser)) {
       fallbackParsers.push(textParser);
     }
     return fallbackParsers;

package/dist/index.d.ts

@@ -6848,6 +6848,16 @@ type RequestAdapterContext = ExecutorContextInterface<RequestAdapterConfig, unkn
  * ```
  */
 type RequestPluginConfig = HeaderInjectorConfig & {
+    /**
+     * Allow empty URL
+     *
+     * If set to `false`, an error will be thrown when both `url` and `baseURL` are empty.
+     * If set to `true` (default), the URL builder will attempt to build the URL even if they are empty.
+     *
+     * @since 3.1.0
+     * @default `true`
+     */
+    allowEmptyUrl?: boolean;
     requestDataSerializer?: (data: unknown, config: RequestAdapterConfig & Omit<RequestPluginConfig, 'requestDataSerializer'>) => unknown;
 };
 interface RequestPluginInnerConfig {
@@ -6947,6 +6957,16 @@ declare class RequestPlugin implements LifecyclePluginInterface<RequestAdapterCo
      * @override
      */
     onBefore(ctx: RequestAdapterContext): void;
+    /**
+     * Main request handler
+     *
+     * This is the core of the plugin. It merges default plugin configuration with request context configuration,
+     * processes request data, builds the URL, and injects headers.
+     *
+     * @param config - Request configuration
+     * @returns Merged configuration with processed data, built URL, and injected headers
+     */
+    mergeConfig(config: RequestAdapterConfig & RequestPluginConfig): RequestAdapterConfig & RequestPluginConfig;
     /**
      * Merge default plugin configuration with request context configuration
      *
@@ -6959,7 +6979,7 @@ declare class RequestPlugin implements LifecyclePluginInterface<RequestAdapterCo
      * @param contextConfig - Configuration from request context
      * @returns Merged configuration
      */
-    protected mergeConfig(contextConfig: RequestAdapterConfig): RequestAdapterConfig & RequestPluginConfig;
+    protected createConfig(contextConfig: RequestAdapterConfig): RequestAdapterConfig & RequestPluginConfig;
     /**
      * Build the URL from the request configuration
      *
@@ -6967,7 +6987,7 @@ declare class RequestPlugin implements LifecyclePluginInterface<RequestAdapterCo
      * @returns The built URL
      * @throws {Error} If the built URL is empty or invalid
      */
-    protected buildUrl(config: RequestAdapterConfig): string;
+    protected buildUrl(config: RequestAdapterConfig & RequestPluginConfig): string;
     /**
      * Inject default headers into request configuration
      *
@@ -7263,6 +7283,7 @@ declare class ResponsePlugin implements LifecyclePluginInterface<ResponsePluginC
      * ```
      */
     onSuccess(context: ResponsePluginContext): Promise<void>;
+    handleResponse(returnValue: unknown, config: ResponsePluginConfig & RequestAdapterConfig<unknown>): Promise<RequestAdapterResponse> | undefined;
     /**
      * Validate response status
      *

package/dist/index.iife.min.js

@@ -6728,15 +6728,29 @@ var qloverFeCorekit = function() {
      * @override
      */ key: "onBefore",
                 value: function onBefore(ctx) {
-                    var mergedConfig = this.mergeConfig(ctx.parameters);
+                    ctx.setParameters(this.mergeConfig(ctx.parameters));
+                }
+            },
+            {
+                /**
+     * Main request handler
+     *
+     * This is the core of the plugin. It merges default plugin configuration with request context configuration,
+     * processes request data, builds the URL, and injects headers.
+     *
+     * @param config - Request configuration
+     * @returns Merged configuration with processed data, built URL, and injected headers
+     */ key: "mergeConfig",
+                value: function mergeConfig(config) {
+                    var mergedConfig = this.createConfig(config);
                     var processedData = this.processRequestData(mergedConfig);
                     var builtUrl = this.buildUrl(mergedConfig);
                     var injectedHeaders = this.injectHeaders(mergedConfig);
-                    ctx.setParameters(_object_spread_props(_object_spread({}, ctx.parameters, mergedConfig), {
+                    return Object.assign(mergedConfig, {
                         data: processedData,
                         url: builtUrl,
                         headers: injectedHeaders
-                    }));
+                    });
                 }
             },
             {
@@ -6751,9 +6765,9 @@ var qloverFeCorekit = function() {
      *
      * @param contextConfig - Configuration from request context
      * @returns Merged configuration
-     */ key: "mergeConfig",
-                value: function mergeConfig(contextConfig) {
-                    var merged = _object_spread({}, this.config, contextConfig);
+     */ key: "createConfig",
+                value: function createConfig(contextConfig) {
+                    var merged = Object.assign(clone_default(this.config), contextConfig);
                     if (!("data" in contextConfig) && "data" in this.config) {
                         merged.data = this.config.data;
                     }
@@ -6769,12 +6783,10 @@ var qloverFeCorekit = function() {
      * @throws {Error} If the built URL is empty or invalid
      */ key: "buildUrl",
                 value: function buildUrl(config) {
-                    var url = this.urlBuilder.buildUrl(config);
-                    if (!url || url.trim() === "") {
-                        var _config_baseURL, _config_url;
-                        throw new Error("RequestPlugin: Invalid URL. URL cannot be empty. baseURL: ".concat((_config_baseURL = config.baseURL) !== null && _config_baseURL !== void 0 ? _config_baseURL : "undefined", ", url: ").concat((_config_url = config.url) !== null && _config_url !== void 0 ? _config_url : "undefined"));
+                    if (config.allowEmptyUrl === false && !config.url && !config.baseURL) {
+                        throw new Error("Empty URL is not allowed");
                     }
-                    return url;
+                    return this.urlBuilder.buildUrl(config);
                 }
             },
             {
@@ -6919,42 +6931,21 @@ var qloverFeCorekit = function() {
      */ function onSuccess(context) {
                     var _this = this;
                     return _async_to_generator(function() {
-                        var returnValue, config, processedResponse, processedResponse1;
+                        var returnValue, config, result;
                         return _ts_generator(this, function(_state) {
                             switch(_state.label){
                                 case 0:
                                     returnValue = context.returnValue;
                                     config = context.parameters;
-                                    if (!_instanceof(returnValue, Response)) return [
-                                        3,
-                                        2
-                                    ];
                                     return [
                                         4,
-                                        _this.processResponse(returnValue, config)
+                                        _this.handleResponse(returnValue, config)
                                     ];
                                 case 1:
-                                    processedResponse = _state.sent();
-                                    context.setReturnValue(processedResponse);
-                                    return [
-                                        2
-                                    ];
-                                case 2:
-                                    if (!isRequestAdapterResponse(returnValue)) return [
-                                        3,
-                                        4
-                                    ];
-                                    return [
-                                        4,
-                                        _this.processAdapterResponse(returnValue, config)
-                                    ];
-                                case 3:
-                                    processedResponse1 = _state.sent();
-                                    context.setReturnValue(processedResponse1);
-                                    return [
-                                        2
-                                    ];
-                                case 4:
+                                    result = _state.sent();
+                                    if (result) {
+                                        context.setReturnValue(result);
+                                    }
                                     return [
                                         2
                                     ];
@@ -6963,6 +6954,17 @@ var qloverFeCorekit = function() {
                     })();
                 }
             },
+            {
+                key: "handleResponse",
+                value: function handleResponse(returnValue, config) {
+                    if (_instanceof(returnValue, Response)) {
+                        return this.processResponse(returnValue, config);
+                    }
+                    if (isRequestAdapterResponse(returnValue)) {
+                        return this.processAdapterResponse(returnValue, config);
+                    }
+                }
+            },
             {
                 /**
      * Validate response status

package/dist/index.js

@@ -3909,6 +3909,7 @@ var SimpleUrlBuilder = class {
 };
 
 // src/request/impl/RequestPlugin.ts
+import { clone as clone2 } from "lodash-es";
 var RequestPlugin = class {
   pluginName = "RequestPlugin";
   config;
@@ -3963,13 +3964,23 @@ var RequestPlugin = class {
    * @override
    */
   onBefore(ctx) {
-    const mergedConfig = this.mergeConfig(ctx.parameters);
+    ctx.setParameters(this.mergeConfig(ctx.parameters));
+  }
+  /**
+   * Main request handler
+   *
+   * This is the core of the plugin. It merges default plugin configuration with request context configuration,
+   * processes request data, builds the URL, and injects headers.
+   *
+   * @param config - Request configuration
+   * @returns Merged configuration with processed data, built URL, and injected headers
+   */
+  mergeConfig(config) {
+    const mergedConfig = this.createConfig(config);
     const processedData = this.processRequestData(mergedConfig);
     const builtUrl = this.buildUrl(mergedConfig);
     const injectedHeaders = this.injectHeaders(mergedConfig);
-    ctx.setParameters({
-      ...ctx.parameters,
-      ...mergedConfig,
+    return Object.assign(mergedConfig, {
       data: processedData,
       url: builtUrl,
       headers: injectedHeaders
@@ -3987,8 +3998,8 @@ var RequestPlugin = class {
    * @param contextConfig - Configuration from request context
    * @returns Merged configuration
    */
-  mergeConfig(contextConfig) {
-    const merged = { ...this.config, ...contextConfig };
+  createConfig(contextConfig) {
+    const merged = Object.assign(clone2(this.config), contextConfig);
     if (!("data" in contextConfig) && "data" in this.config) {
       merged.data = this.config.data;
     }
@@ -4002,13 +4013,10 @@ var RequestPlugin = class {
    * @throws {Error} If the built URL is empty or invalid
    */
   buildUrl(config) {
-    const url = this.urlBuilder.buildUrl(config);
-    if (!url || url.trim() === "") {
-      throw new Error(
-        `RequestPlugin: Invalid URL. URL cannot be empty. baseURL: ${config.baseURL ?? "undefined"}, url: ${config.url ?? "undefined"}`
-      );
+    if (config.allowEmptyUrl === false && !config.url && !config.baseURL) {
+      throw new Error("Empty URL is not allowed");
     }
-    return url;
+    return this.urlBuilder.buildUrl(config);
   }
   /**
    * Inject default headers into request configuration
@@ -4143,18 +4151,17 @@ var ResponsePlugin = class {
   async onSuccess(context) {
     const returnValue = context.returnValue;
     const config = context.parameters;
+    const result = await this.handleResponse(returnValue, config);
+    if (result) {
+      context.setReturnValue(result);
+    }
+  }
+  handleResponse(returnValue, config) {
     if (returnValue instanceof Response) {
-      const processedResponse = await this.processResponse(returnValue, config);
-      context.setReturnValue(processedResponse);
-      return;
+      return this.processResponse(returnValue, config);
     }
     if (isRequestAdapterResponse(returnValue)) {
-      const processedResponse = await this.processAdapterResponse(
-        returnValue,
-        config
-      );
-      context.setReturnValue(processedResponse);
-      return;
+      return this.processAdapterResponse(returnValue, config);
     }
   }
   /**

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@qlover/fe-corekit",
   "description": "A corekit for frontwork",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "private": false,
   "type": "module",
   "files": [