fexios-browser 2.0.0 → 2.1.0

package/README.md

@@ -20,23 +20,63 @@ npm i fexios-browser
 pnpm add fexios-browser
 ```
 
-## 使用
+## 基本使用
 
 ```ts
 type UserRequest = {
-  account: string,
-  password: string,
-};
+    account: string,
+    password: string,
+  };
 
-const api = new Fexios<UserRequest>({
+type UserResponse = UserRequest & {
+  token: string,
+};
+// 请求类型和响应类型
+const api = new Fexios<UserRequest, UserResponse>({
   baseURL: "http://xxx",
   headers: { "Content-Type": "application/json" }
 });
 
 const response = await api.post('/api/v1/login', {
-    data: {
-        account: "admin",
-        password: "admin"
-    }
+  account: "18259008878",
+  password: "123456"
+});
+
+if (response.type === 'json') { // 如果能够自动json处理
+  console.log(response.data satisfies UserResponse);
+} else { // 否则返回Response
+  console.log(response.data satisfies Response);
+}
+```
+
+## 拦截器
+
+```ts
+// 请求拦截器
+api.interceptors.request.use((config) => {
+  console.log({
+    message: 'Request in interceptor',
+    data: config,
+  });
+  return config;
+}, (error) => {
+  console.error({
+    message: 'An error occurred during the request',
+    reason: error,
+  });
+  return Promise.reject(error);
+});
+// 响应拦截器
+api.interceptors.response.use((response) => {
+  console.log({
+    message: 'Response in interceptor',
+    data: response,
+  });
+  return response;
+}, (error) => {
+  console.error({
+    message: 'An error occurred during the response',
+    reason: error,
+  });
 });
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fexios-browser",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "对fetch的封装, 使其能够表现的像axios",
   "main": "dist/index.cjs",
   "types": "dist/index.d.ts",

package/dist/InterceptorManager.cjs

@@ -1,56 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/InterceptorManager.ts
-var InterceptorManager_exports = {};
-__export(InterceptorManager_exports, {
-  default: () => InterceptorManager_default
-});
-module.exports = __toCommonJS(InterceptorManager_exports);
-var InterceptorManager = class {
-  handlers;
-  constructor() {
-    this.handlers = [];
-  }
-  use(fulfilled, rejected) {
-    this.handlers.push({
-      onFulfilled: fulfilled,
-      onRejected: rejected
-    });
-    return this.handlers.length - 1;
-  }
-  eject(id) {
-    if (this.handlers[id]) {
-      this.handlers[id] = void 0;
-    }
-  }
-  clear() {
-    if (this.handlers) {
-      this.handlers = [];
-    }
-  }
-  forEach(fn) {
-    this.handlers.forEach((handler) => {
-      if (handler) {
-        fn(handler);
-      }
-    });
-  }
-};
-var InterceptorManager_default = InterceptorManager;

package/dist/InterceptorManager.d.cts

@@ -1,14 +0,0 @@
-interface Handler<T> {
-    onFulfilled?: ((value: T) => T | Promise<T>);
-    onRejected?: ((error: any) => any);
-}
-declare class InterceptorManager<T> {
-    handlers: (Handler<T> | undefined)[];
-    constructor();
-    use(fulfilled?: ((value: T) => T | Promise<T>), rejected?: ((error: any) => any)): number;
-    eject(id: number): void;
-    clear(): void;
-    forEach(fn: (value: Handler<T>) => any): void;
-}
-
-export { type Handler, InterceptorManager as default };

package/dist/InterceptorManager.d.ts

@@ -1,14 +0,0 @@
-interface Handler<T> {
-    onFulfilled?: ((value: T) => T | Promise<T>);
-    onRejected?: ((error: any) => any);
-}
-declare class InterceptorManager<T> {
-    handlers: (Handler<T> | undefined)[];
-    constructor();
-    use(fulfilled?: ((value: T) => T | Promise<T>), rejected?: ((error: any) => any)): number;
-    eject(id: number): void;
-    clear(): void;
-    forEach(fn: (value: Handler<T>) => any): void;
-}
-
-export { type Handler, InterceptorManager as default };

package/dist/InterceptorManager.js

@@ -1,6 +0,0 @@
-import {
-  InterceptorManager_default
-} from "./chunk-HIR6OZ3W.js";
-export {
-  InterceptorManager_default as default
-};

package/dist/chunk-HIR6OZ3W.js

@@ -1,36 +0,0 @@
-// src/InterceptorManager.ts
-var InterceptorManager = class {
-  handlers;
-  constructor() {
-    this.handlers = [];
-  }
-  use(fulfilled, rejected) {
-    this.handlers.push({
-      onFulfilled: fulfilled,
-      onRejected: rejected
-    });
-    return this.handlers.length - 1;
-  }
-  eject(id) {
-    if (this.handlers[id]) {
-      this.handlers[id] = void 0;
-    }
-  }
-  clear() {
-    if (this.handlers) {
-      this.handlers = [];
-    }
-  }
-  forEach(fn) {
-    this.handlers.forEach((handler) => {
-      if (handler) {
-        fn(handler);
-      }
-    });
-  }
-};
-var InterceptorManager_default = InterceptorManager;
-
-export {
-  InterceptorManager_default
-};

package/dist/chunk-ZTE6UN5I.js

@@ -1,31 +0,0 @@
-// src/dispatchRequest.ts
-async function dispatchRequest(config) {
-  const rowResponse = await fetch(new URL(config.url, config.baseURL), {
-    method: config.method,
-    headers: config.headers,
-    body: config.data ? JSON.stringify(config.data) : void 0
-  });
-  const contentType = rowResponse.headers.get("Content-Type") || "";
-  let responseData;
-  if (contentType.includes("application/json")) {
-    responseData = await rowResponse.json();
-  } else {
-    responseData = rowResponse;
-  }
-  const headers = {};
-  rowResponse.headers.forEach((value, key) => {
-    headers[key] = value;
-  });
-  const response = {
-    status: rowResponse.status,
-    statusText: rowResponse.statusText,
-    data: responseData,
-    headers,
-    config
-  };
-  return response;
-}
-
-export {
-  dispatchRequest
-};

package/dist/dispatchRequest.cjs

@@ -1,51 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/dispatchRequest.ts
-var dispatchRequest_exports = {};
-__export(dispatchRequest_exports, {
-  default: () => dispatchRequest
-});
-module.exports = __toCommonJS(dispatchRequest_exports);
-async function dispatchRequest(config) {
-  const rowResponse = await fetch(new URL(config.url, config.baseURL), {
-    method: config.method,
-    headers: config.headers,
-    body: config.data ? JSON.stringify(config.data) : void 0
-  });
-  const contentType = rowResponse.headers.get("Content-Type") || "";
-  let responseData;
-  if (contentType.includes("application/json")) {
-    responseData = await rowResponse.json();
-  } else {
-    responseData = rowResponse;
-  }
-  const headers = {};
-  rowResponse.headers.forEach((value, key) => {
-    headers[key] = value;
-  });
-  const response = {
-    status: rowResponse.status,
-    statusText: rowResponse.statusText,
-    data: responseData,
-    headers,
-    config
-  };
-  return response;
-}

package/dist/dispatchRequest.d.cts

@@ -1,6 +0,0 @@
-import { FRequestConfig, FResponse } from './index.cjs';
-import './InterceptorManager.cjs';
-
-declare function dispatchRequest<T>(config: FRequestConfig<T>): Promise<FResponse<T>>;
-
-export { dispatchRequest as default };

package/dist/dispatchRequest.d.ts

@@ -1,6 +0,0 @@
-import { FRequestConfig, FResponse } from './index.js';
-import './InterceptorManager.js';
-
-declare function dispatchRequest<T>(config: FRequestConfig<T>): Promise<FResponse<T>>;
-
-export { dispatchRequest as default };

package/dist/dispatchRequest.js

@@ -1,6 +0,0 @@
-import {
-  dispatchRequest
-} from "./chunk-ZTE6UN5I.js";
-export {
-  dispatchRequest as default
-};

package/dist/index.cjs

@@ -1,143 +0,0 @@
-"use strict";
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-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 __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-
-// src/index.ts
-var index_exports = {};
-__export(index_exports, {
-  default: () => index_default
-});
-module.exports = __toCommonJS(index_exports);
-
-// src/dispatchRequest.ts
-async function dispatchRequest(config) {
-  const rowResponse = await fetch(new URL(config.url, config.baseURL), {
-    method: config.method,
-    headers: config.headers,
-    body: config.data ? JSON.stringify(config.data) : void 0
-  });
-  const contentType = rowResponse.headers.get("Content-Type") || "";
-  let responseData;
-  if (contentType.includes("application/json")) {
-    responseData = await rowResponse.json();
-  } else {
-    responseData = rowResponse;
-  }
-  const headers = {};
-  rowResponse.headers.forEach((value, key) => {
-    headers[key] = value;
-  });
-  const response = {
-    status: rowResponse.status,
-    statusText: rowResponse.statusText,
-    data: responseData,
-    headers,
-    config
-  };
-  return response;
-}
-
-// src/InterceptorManager.ts
-var InterceptorManager = class {
-  handlers;
-  constructor() {
-    this.handlers = [];
-  }
-  use(fulfilled, rejected) {
-    this.handlers.push({
-      onFulfilled: fulfilled,
-      onRejected: rejected
-    });
-    return this.handlers.length - 1;
-  }
-  eject(id) {
-    if (this.handlers[id]) {
-      this.handlers[id] = void 0;
-    }
-  }
-  clear() {
-    if (this.handlers) {
-      this.handlers = [];
-    }
-  }
-  forEach(fn) {
-    this.handlers.forEach((handler) => {
-      if (handler) {
-        fn(handler);
-      }
-    });
-  }
-};
-var InterceptorManager_default = InterceptorManager;
-
-// src/index.ts
-var Fexios = class {
-  get;
-  post;
-  delete;
-  put;
-  head;
-  options;
-  patch;
-  purge;
-  link;
-  unlink;
-  defaults;
-  interceptors;
-  constructor(initConfig) {
-    this.defaults = initConfig;
-    this.interceptors = {
-      request: new InterceptorManager_default(),
-      response: new InterceptorManager_default()
-    };
-    const methods = ["get", "post", "delete", "put", "head", "options", "patch", "purge", "link", "unlink"];
-    methods.forEach((method) => {
-      this[method] = async (url, request) => {
-        const requestConfig = {
-          ...request,
-          url,
-          method: method.toUpperCase()
-        };
-        return this.request(requestConfig);
-      };
-    });
-  }
-  async request(config) {
-    const mergedRequest = {
-      ...config,
-      headers: { ...this.defaults.headers, ...config.headers },
-      baseURL: config.baseURL || this.defaults.baseURL
-    };
-    let chain = [dispatchRequest, void 0];
-    this.interceptors.request.forEach((interceptor) => {
-      interceptor.onFulfilled;
-      chain.unshift(interceptor.onFulfilled, interceptor.onRejected);
-    });
-    this.interceptors.request.forEach((interceptor) => {
-      chain.push(interceptor.onFulfilled, interceptor.onRejected);
-    });
-    let i = 0;
-    let len = chain.length;
-    let promise = Promise.resolve(mergedRequest);
-    while (i < len) {
-      promise = promise.then(chain[i++], chain[i++]);
-    }
-    return promise;
-  }
-};
-var index_default = Fexios;

package/dist/index.d.cts

@@ -1,84 +0,0 @@
-import InterceptorManager from './InterceptorManager.cjs';
-
-/**
- * 请求方法类型
- */
-type Method = 'get' | 'GET' | 'delete' | 'DELETE' | 'head' | 'HEAD' | 'options' | 'OPTIONS' | 'post' | 'POST' | 'put' | 'PUT' | 'patch' | 'PATCH' | 'purge' | 'PURGE' | 'link' | 'LINK' | 'unlink' | 'UNLINK';
-/**
- * 请求配置类型
- */
-interface FRequestConfig<T> {
-    /**
-     * 基于baseURL的请求地址
-     */
-    url: string | URL;
-    /**
-     * 请求头
-     */
-    headers?: Record<string, string>;
-    /**
-     * 请求方法
-     */
-    method: Method;
-    /**
-     * baseURL
-     */
-    baseURL?: string | URL;
-    /**
-     * 传输数据
-     */
-    data?: T;
-}
-/**
- * 响应类型
- */
-interface FResponse<T> {
-    /**
-     * HTTP响应码
-     */
-    status: number;
-    /**
-     * HTTP响应信息
-     */
-    statusText: string;
-    /**
-     * 响应数据
-     */
-    data: any;
-    /**
-     * 响应头
-     */
-    headers: Record<string, string>;
-    /**
-     * 请求的配置
-     */
-    config: FRequestConfig<T>;
-}
-/**
- * 初始化配置类型
- */
-interface InitConfig {
-    baseURL: string | URL;
-    headers: Record<string, string>;
-}
-declare class Fexios<T = any> {
-    get: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    post: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    delete: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    put: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    head: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    options: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    patch: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    purge: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    link: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    unlink: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    defaults: InitConfig;
-    interceptors: {
-        request: InterceptorManager<FRequestConfig<T>>;
-        response: InterceptorManager<FResponse<T>>;
-    };
-    constructor(initConfig: InitConfig);
-    request(config: FRequestConfig<T>): Promise<FResponse<T>>;
-}
-
-export { type FRequestConfig, type FResponse, type InitConfig, type Method, Fexios as default };

package/dist/index.d.ts

@@ -1,84 +0,0 @@
-import InterceptorManager from './InterceptorManager.js';
-
-/**
- * 请求方法类型
- */
-type Method = 'get' | 'GET' | 'delete' | 'DELETE' | 'head' | 'HEAD' | 'options' | 'OPTIONS' | 'post' | 'POST' | 'put' | 'PUT' | 'patch' | 'PATCH' | 'purge' | 'PURGE' | 'link' | 'LINK' | 'unlink' | 'UNLINK';
-/**
- * 请求配置类型
- */
-interface FRequestConfig<T> {
-    /**
-     * 基于baseURL的请求地址
-     */
-    url: string | URL;
-    /**
-     * 请求头
-     */
-    headers?: Record<string, string>;
-    /**
-     * 请求方法
-     */
-    method: Method;
-    /**
-     * baseURL
-     */
-    baseURL?: string | URL;
-    /**
-     * 传输数据
-     */
-    data?: T;
-}
-/**
- * 响应类型
- */
-interface FResponse<T> {
-    /**
-     * HTTP响应码
-     */
-    status: number;
-    /**
-     * HTTP响应信息
-     */
-    statusText: string;
-    /**
-     * 响应数据
-     */
-    data: any;
-    /**
-     * 响应头
-     */
-    headers: Record<string, string>;
-    /**
-     * 请求的配置
-     */
-    config: FRequestConfig<T>;
-}
-/**
- * 初始化配置类型
- */
-interface InitConfig {
-    baseURL: string | URL;
-    headers: Record<string, string>;
-}
-declare class Fexios<T = any> {
-    get: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    post: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    delete: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    put: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    head: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    options: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    patch: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    purge: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    link: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    unlink: (url: string | URL, request?: Omit<FRequestConfig<T>, "url" | "method">) => Promise<FResponse<T>>;
-    defaults: InitConfig;
-    interceptors: {
-        request: InterceptorManager<FRequestConfig<T>>;
-        response: InterceptorManager<FResponse<T>>;
-    };
-    constructor(initConfig: InitConfig);
-    request(config: FRequestConfig<T>): Promise<FResponse<T>>;
-}
-
-export { type FRequestConfig, type FResponse, type InitConfig, type Method, Fexios as default };

package/dist/index.js

@@ -1,66 +0,0 @@
-import {
-  dispatchRequest
-} from "./chunk-ZTE6UN5I.js";
-import {
-  InterceptorManager_default
-} from "./chunk-HIR6OZ3W.js";
-
-// src/index.ts
-var Fexios = class {
-  get;
-  post;
-  delete;
-  put;
-  head;
-  options;
-  patch;
-  purge;
-  link;
-  unlink;
-  defaults;
-  interceptors;
-  constructor(initConfig) {
-    this.defaults = initConfig;
-    this.interceptors = {
-      request: new InterceptorManager_default(),
-      response: new InterceptorManager_default()
-    };
-    const methods = ["get", "post", "delete", "put", "head", "options", "patch", "purge", "link", "unlink"];
-    methods.forEach((method) => {
-      this[method] = async (url, request) => {
-        const requestConfig = {
-          ...request,
-          url,
-          method: method.toUpperCase()
-        };
-        return this.request(requestConfig);
-      };
-    });
-  }
-  async request(config) {
-    const mergedRequest = {
-      ...config,
-      headers: { ...this.defaults.headers, ...config.headers },
-      baseURL: config.baseURL || this.defaults.baseURL
-    };
-    let chain = [dispatchRequest, void 0];
-    this.interceptors.request.forEach((interceptor) => {
-      interceptor.onFulfilled;
-      chain.unshift(interceptor.onFulfilled, interceptor.onRejected);
-    });
-    this.interceptors.request.forEach((interceptor) => {
-      chain.push(interceptor.onFulfilled, interceptor.onRejected);
-    });
-    let i = 0;
-    let len = chain.length;
-    let promise = Promise.resolve(mergedRequest);
-    while (i < len) {
-      promise = promise.then(chain[i++], chain[i++]);
-    }
-    return promise;
-  }
-};
-var index_default = Fexios;
-export {
-  index_default as default
-};