@blueking/chat-helper 0.0.1-beta.32 → 0.0.1-beta.34

package/dist/http/fetch/index.ts.js

@@ -22,33 +22,82 @@
  * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF
  * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
  * IN THE SOFTWARE.
- */ import { FetchClient } from './fetch.ts.js';
-export const useFetch = (options)=>{
+ */ function _define_property(obj, key, value) {
+    if (key in obj) {
+        Object.defineProperty(obj, key, {
+            value: value,
+            enumerable: true,
+            configurable: true,
+            writable: true
+        });
+    } else {
+        obj[key] = value;
+    }
+    return obj;
+}
+function _object_spread(target) {
+    for(var i = 1; i < arguments.length; i++){
+        var source = arguments[i] != null ? arguments[i] : {};
+        var ownKeys = Object.keys(source);
+        if (typeof Object.getOwnPropertySymbols === "function") {
+            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
+                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
+            }));
+        }
+        ownKeys.forEach(function(key) {
+            _define_property(target, key, source[key]);
+        });
+    }
+    return target;
+}
+import { FetchClient } from './fetch.ts.js';
+/**
+ * 注册所有拦截器（内部 requestData 注入 + 用户自定义）
+ * 抽取为独立函数，避免 useFetch 和 reset 中重复逻辑
+ */ function applyInterceptors(fetchClient, options) {
     var _options_interceptors, _options_interceptors1;
-    const fetchClient = new FetchClient({
-        baseURL: options.requestData.urlPrefix
-    });
-    // 用户定义拦截器
+    const { headers: customHeaders, data: customData } = options.requestData;
+    if (customHeaders || customData) {
+        fetchClient.interceptors.request.use((config)=>{
+            if (customHeaders) {
+                const resolved = typeof customHeaders === 'function' ? customHeaders() : customHeaders;
+                const existing = typeof config.headers === 'function' ? config.headers() : config.headers || {};
+                config.headers = _object_spread({}, existing, resolved);
+            }
+            const method = (config.method || 'GET').toUpperCase();
+            const supportsBody = ![
+                'GET',
+                'HEAD'
+            ].includes(method);
+            if (customData && supportsBody) {
+                const resolved = typeof customData === 'function' ? customData() : customData;
+                const existingData = typeof config.data === 'function' ? config.data() : config.data;
+                if (existingData && typeof existingData === 'object' && !Array.isArray(existingData)) {
+                    config.data = _object_spread({}, resolved, existingData);
+                } else if (!existingData) {
+                    config.data = resolved;
+                }
+            }
+            return config;
+        });
+    }
     if ((_options_interceptors = options.interceptors) === null || _options_interceptors === void 0 ? void 0 : _options_interceptors.request) {
         fetchClient.interceptors.request.use(options.interceptors.request);
     }
     if ((_options_interceptors1 = options.interceptors) === null || _options_interceptors1 === void 0 ? void 0 : _options_interceptors1.response) {
         fetchClient.interceptors.response.use(options.interceptors.response);
     }
-    // 重置 fetchClient 配置
+}
+export const useFetch = (options)=>{
+    const fetchClient = new FetchClient({
+        baseURL: options.requestData.urlPrefix
+    });
+    applyInterceptors(fetchClient, options);
     const reset = (newOptions)=>{
-        var _newOptions_interceptors, _newOptions_interceptors1;
-        // 更新 baseURL
         fetchClient.defaults.baseURL = newOptions.requestData.urlPrefix;
-        // 清空并重新注册拦截器
         fetchClient.interceptors.request.clear();
         fetchClient.interceptors.response.clear();
-        if ((_newOptions_interceptors = newOptions.interceptors) === null || _newOptions_interceptors === void 0 ? void 0 : _newOptions_interceptors.request) {
-            fetchClient.interceptors.request.use(newOptions.interceptors.request);
-        }
-        if ((_newOptions_interceptors1 = newOptions.interceptors) === null || _newOptions_interceptors1 === void 0 ? void 0 : _newOptions_interceptors1.response) {
-            fetchClient.interceptors.response.use(newOptions.interceptors.response);
-        }
+        applyInterceptors(fetchClient, newOptions);
     };
     return {
         fetchClient,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/chat-helper",
-  "version": "0.0.1-beta.32",
+  "version": "0.0.1-beta.34",
   "description": "",
   "main": "./dist/index.ts.js",
   "types": "./dist/index.d.ts",
@@ -25,4 +25,4 @@
     "typescript": "^5.5.4",
     "vue-tsc": "^3.1.4"
   }
-}
+}