uview-pro 0.2.4 → 0.3.1

package/libs/request/auto-http.ts

@@ -1,76 +1,76 @@
-import deepMerge from '../function/deepMerge';
-
-export function isFunction(f: any): boolean {
-    return typeof f === 'function';
-}
-
-export function isPromise(p: any): boolean {
-    return !!(p && p.then && p.catch);
-}
-
-export function isArray(arr: any) {
-    return Object.prototype.toString.call(arr) === '[object Array]';
-}
-
-/**
- * 构建基础类
- */
-class Builder<T> {
-    instance: any;
-
-    constructor(instance: any) {
-        this.instance = instance;
-    }
-    /**
-     *
-     * @param urlConfig url 配置表
-     * @param extra 其他请求方法对象
-     * @returns Object
-     */
-    dispatch(urlConfig: Record<string, any>, extra: Record<string, any> = {}): Record<string, any> {
-        const builder: Record<string, any> = {};
-        // 创建 API
-        Object.keys(urlConfig).forEach(name => {
-            builder[name] = this.use.bind(this, urlConfig[name]);
-        });
-        return { ...builder, ...extra };
-    }
-    /**
-     * 发送请求
-     * @param {*} urlConfig : url 配置表
-     * @demo urlConfig = { login: { url: '/user/login', method: 'GET', loading: true } }
-     * @param {*} config : 开放配置，用户主动配置的
-     * @demo api.login({ params: { username: "admin" } })
-     * @returns Promise
-     */
-    use(urlConfig: Record<string, any>, config: Record<string, any> = {}): Promise<T> {
-        // 请求地址
-        let url = config?.url ?? urlConfig.url;
-        // 兼容 restful url，如果是使用url为function，则为restful格式
-        if (config.url && isFunction(config.url)) {
-            url = `${urlConfig.url}${config.url()}`;
-        }
-        // 请求类型，get,post,put,delete
-        const method = config?.method ?? urlConfig?.method ?? 'GET';
-        // 如果有自定义的工厂函数基础类
-        const options = { ...deepMerge(urlConfig, config), url, method };
-        if (isFunction(this.instance) || isPromise(this.instance)) {
-            return this.instance(options);
-        }
-        // 如果是使用的 instance
-        // 默认的请求基础类
-        return this.instance.request(options);
-    }
-}
-
-/**
- * Http 基础类
- */
-class AutoHttp {
-    static get Builder() {
-        return Builder;
-    }
-    constructor() {}
-}
-
-export { AutoHttp };
+import deepMerge from '../function/deepMerge';
+
+export function isFunction(f: any): boolean {
+    return typeof f === 'function';
+}
+
+export function isPromise(p: any): boolean {
+    return !!(p && p.then && p.catch);
+}
+
+export function isArray(arr: any) {
+    return Object.prototype.toString.call(arr) === '[object Array]';
+}
+
+/**
+ * 构建基础类
+ */
+class Builder<T> {
+    instance: any;
+
+    constructor(instance: any) {
+        this.instance = instance;
+    }
+    /**
+     *
+     * @param urlConfig url 配置表
+     * @param extra 其他请求方法对象
+     * @returns Object
+     */
+    dispatch(urlConfig: Record<string, any>, extra: Record<string, any> = {}): Record<string, any> {
+        const builder: Record<string, any> = {};
+        // 创建 API
+        Object.keys(urlConfig).forEach(name => {
+            builder[name] = this.use.bind(this, urlConfig[name]);
+        });
+        return { ...builder, ...extra };
+    }
+    /**
+     * 发送请求
+     * @param {*} urlConfig : url 配置表
+     * @demo urlConfig = { login: { url: '/user/login', method: 'GET', loading: true } }
+     * @param {*} config : 开放配置，用户主动配置的
+     * @demo api.login({ params: { username: "admin" } })
+     * @returns Promise
+     */
+    use(urlConfig: Record<string, any>, config: Record<string, any> = {}): Promise<T> {
+        // 请求地址
+        let url = config?.url ?? urlConfig.url;
+        // 兼容 restful url，如果是使用url为function，则为restful格式
+        if (config.url && isFunction(config.url)) {
+            url = `${urlConfig.url}${config.url()}`;
+        }
+        // 请求类型，get,post,put,delete
+        const method = config?.method ?? urlConfig?.method ?? 'GET';
+        // 如果有自定义的工厂函数基础类
+        const options = { ...deepMerge(urlConfig, config), url, method };
+        if (isFunction(this.instance) || isPromise(this.instance)) {
+            return this.instance(options);
+        }
+        // 如果是使用的 instance
+        // 默认的请求基础类
+        return this.instance.request(options);
+    }
+}
+
+/**
+ * Http 基础类
+ */
+class AutoHttp {
+    static get Builder() {
+        return Builder;
+    }
+    constructor() {}
+}
+
+export { AutoHttp };

package/libs/request/index.ts

@@ -1,242 +1,242 @@
-import deepMerge from '../function/deepMerge';
-
-/**
- * 请求配置项Meta类型定义
- */
-export interface RequestMeta {
-    toast?: boolean;
-    loading?: boolean;
-    originalData?: boolean;
-    [key: string]: any;
-}
-
-/**
- * 请求配置项类型定义
- */
-export interface RequestConfig {
-    baseUrl?: string;
-    header?: Record<string, any>;
-    method?: string;
-    dataType?: string;
-    responseType?: string;
-    meta?: RequestMeta;
-}
-
-/**
- * 请求拦截器类型定义
- */
-export interface RequestInterceptor {
-    request?: ((options: RequestOptions) => RequestOptions | false) | null;
-    response?: ((response: any) => any | false) | null;
-}
-
-/**
- * 请求参数类型定义
- */
-export interface RequestOptions {
-    url: string;
-    header: Record<string, any>;
-    method: 'GET' | 'POST' | 'OPTIONS' | 'HEAD' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
-    data?: any;
-    dataType?: string;
-    responseType?: string;
-    params?: Record<string, any>;
-    complete?: (response: any) => void;
-    meta?: RequestMeta;
-}
-
-export class Request {
-    public config: RequestConfig;
-    public interceptor: RequestInterceptor;
-    public options?: RequestOptions;
-
-    constructor() {
-        this.config = {
-            baseUrl: '', // 请求的根域名
-            header: {}, // 默认的请求头
-            method: 'POST', // 请求方式
-            dataType: 'json', // 设置为json，返回后uni.request会对数据进行一次JSON.parse
-            responseType: 'text', // 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
-            meta: {
-                originalData: true, // 是否在拦截器中返回服务端的原始数据，见文档说明
-                toast: false, // 是否在请求出错时，弹出toast
-                loading: false // 是否显示加载中
-            }
-        };
-        this.interceptor = {
-            request: null,
-            response: null
-        };
-    }
-    /**
-     * 设置全局默认配置
-     * @param customConfig 自定义配置
-     */
-    setConfig(customConfig: Partial<RequestConfig>): void {
-        this.config = deepMerge(this.config, customConfig);
-    }
-
-    /**
-     * 主要请求部分
-     * @param options 请求参数
-     */
-    request<T = unknown>(options: RequestOptions): Promise<T> {
-        // 合并 meta 配置，优先级：单次请求 > 全局
-        const mergedMeta: RequestMeta = {
-            ...this.config.meta,
-            ...(options.meta || {})
-        };
-        // 让 options.meta 传递到拦截器
-        options.meta = mergedMeta;
-
-        if (this.interceptor.request && typeof this.interceptor.request === 'function') {
-            const interceptorRequest = this.interceptor.request(options);
-            if (interceptorRequest === false) {
-                // 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
-                return new Promise(() => {});
-            }
-            this.options = interceptorRequest;
-        }
-        options.dataType = options.dataType || this.config.dataType;
-        options.responseType = options.responseType || this.config.responseType;
-        options.url = options.url || '';
-        options.params = options.params || {};
-        options.header = Object.assign({}, this.config.header, options.header);
-        options.method = (options.method || this.config.method) as RequestOptions['method'];
-        // 保证 url 一定为 string
-        if (!options.url) options.url = '';
-
-        return new Promise<T>((resolve, reject) => {
-            options.complete = (response: any) => {
-                // 读取 meta 配置
-                const meta = options.meta || this.config.meta || {};
-                const originalData = meta.originalData ?? false;
-                // 拦截器处理，加入request的配置参数
-                response.config = options;
-                if (originalData) {
-                    // 判断是否存在拦截器
-                    if (this.interceptor.response && typeof this.interceptor.response === 'function') {
-                        const resInterceptors = this.interceptor.response(response);
-                        // 如果拦截器不返回false，就将拦截器返回的内容给请求的then回调
-                        if (resInterceptors !== false) {
-                            resolve(resInterceptors);
-                        } else {
-                            // 如果拦截器返回false，意味着拦截器定义者认为返回有问题，直接接入catch回调
-                            reject(response);
-                        }
-                    } else {
-                        // 如果要求返回原始数据，就算没有拦截器，也返回最原始的数据
-                        resolve(response);
-                    }
-                } else {
-                    if (response.statusCode === 200) {
-                        if (this.interceptor.response && typeof this.interceptor.response === 'function') {
-                            const resInterceptors = this.interceptor.response(response.data);
-                            if (resInterceptors !== false) {
-                                resolve(resInterceptors);
-                            } else {
-                                reject(response.data);
-                            }
-                        } else {
-                            // 如果不是返回原始数据(originalData=false)，且没有拦截器的情况下，返回纯数据给then回调
-                            resolve(response.data);
-                        }
-                    } else {
-                        reject(response);
-                    }
-                }
-            };
-            // 判断用户传递的URL是否http开头
-            options.url =
-                options.url && options.url.indexOf('http') !== 0
-                    ? this.config.baseUrl + (options.url.indexOf('/') === 0 ? options.url : `/${options.url}`)
-                    : options.url;
-            uni.request(options);
-        });
-    }
-
-    get<T = unknown>(
-        url: string,
-        data: any = {},
-        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
-    ): Promise<T> {
-        return this.request<T>({
-            method: 'GET',
-            url,
-            data,
-            header: options.header,
-            meta: options.meta
-        });
-    }
-
-    post<T = unknown>(
-        url: string,
-        data: any = {},
-        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
-    ): Promise<T> {
-        return this.request<T>({
-            url,
-            method: 'POST',
-            data,
-            header: options.header,
-            meta: options.meta
-        });
-    }
-
-    put<T = unknown>(
-        url: string,
-        data: any = {},
-        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
-    ): Promise<T> {
-        return this.request<T>({
-            url,
-            method: 'PUT',
-            data,
-            header: options.header,
-            meta: options.meta
-        });
-    }
-
-    delete<T = unknown>(
-        url: string,
-        data: any = {},
-        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
-    ): Promise<T> {
-        return this.request<T>({
-            url,
-            method: 'DELETE',
-            data,
-            header: options.header,
-            meta: options.meta
-        });
-    }
-}
-
-// 插件化导出，支持 app.use(http, { interceptor })
-const httpInstance = new Request();
-
-interface HttpPluginOptions {
-    requestConfig?: Partial<RequestConfig>;
-    interceptor?: RequestInterceptor;
-}
-
-// 全局导出，支持 import { httpPlugin } from 'uview-pro'
-const httpPlugin = {
-    install(app: any, options: HttpPluginOptions = {}) {
-        if (options.interceptor) {
-            const { request, response } = options.interceptor;
-            if (request) httpInstance.interceptor.request = request;
-            if (response) httpInstance.interceptor.response = response;
-        }
-        if (options.requestConfig) {
-            httpInstance.setConfig(options.requestConfig);
-        }
-        app.config.globalProperties.$http = httpInstance;
-    }
-};
-
-// 全局导出，支持 import { http } from 'uview-pro'
-export { httpInstance as http };
-
-// 插件化导出，支持 app.use(http, { interceptor })
-export default httpPlugin;
+import deepMerge from '../function/deepMerge';
+
+/**
+ * 请求配置项Meta类型定义
+ */
+export interface RequestMeta {
+    toast?: boolean;
+    loading?: boolean;
+    originalData?: boolean;
+    [key: string]: any;
+}
+
+/**
+ * 请求配置项类型定义
+ */
+export interface RequestConfig {
+    baseUrl?: string;
+    header?: Record<string, any>;
+    method?: string;
+    dataType?: string;
+    responseType?: string;
+    meta?: RequestMeta;
+}
+
+/**
+ * 请求拦截器类型定义
+ */
+export interface RequestInterceptor {
+    request?: ((options: RequestOptions) => RequestOptions | false) | null;
+    response?: ((response: any) => any | false) | null;
+}
+
+/**
+ * 请求参数类型定义
+ */
+export interface RequestOptions {
+    url: string;
+    header: Record<string, any>;
+    method: 'GET' | 'POST' | 'OPTIONS' | 'HEAD' | 'PUT' | 'DELETE' | 'TRACE' | 'CONNECT';
+    data?: any;
+    dataType?: string;
+    responseType?: string;
+    params?: Record<string, any>;
+    complete?: (response: any) => void;
+    meta?: RequestMeta;
+}
+
+export class Request {
+    public config: RequestConfig;
+    public interceptor: RequestInterceptor;
+    public options?: RequestOptions;
+
+    constructor() {
+        this.config = {
+            baseUrl: '', // 请求的根域名
+            header: {}, // 默认的请求头
+            method: 'POST', // 请求方式
+            dataType: 'json', // 设置为json，返回后uni.request会对数据进行一次JSON.parse
+            responseType: 'text', // 此参数无需处理，因为5+和支付宝小程序不支持，默认为text即可
+            meta: {
+                originalData: true, // 是否在拦截器中返回服务端的原始数据，见文档说明
+                toast: false, // 是否在请求出错时，弹出toast
+                loading: false // 是否显示加载中
+            }
+        };
+        this.interceptor = {
+            request: null,
+            response: null
+        };
+    }
+    /**
+     * 设置全局默认配置
+     * @param customConfig 自定义配置
+     */
+    setConfig(customConfig: Partial<RequestConfig>): void {
+        this.config = deepMerge(this.config, customConfig);
+    }
+
+    /**
+     * 主要请求部分
+     * @param options 请求参数
+     */
+    request<T = unknown>(options: RequestOptions): Promise<T> {
+        // 合并 meta 配置，优先级：单次请求 > 全局
+        const mergedMeta: RequestMeta = {
+            ...this.config.meta,
+            ...(options.meta || {})
+        };
+        // 让 options.meta 传递到拦截器
+        options.meta = mergedMeta;
+        options.dataType = options.dataType || this.config.dataType;
+        options.responseType = options.responseType || this.config.responseType;
+        options.url = options.url || '';
+        options.params = options.params || {};
+        options.header = Object.assign({}, this.config.header || {}, options.header || {});
+        options.method = (options.method || this.config.method) as RequestOptions['method'];
+        // 保证 url 一定为 string
+        if (!options.url) options.url = '';
+
+        if (this.interceptor.request && typeof this.interceptor.request === 'function') {
+            const interceptorRequest = this.interceptor.request(options);
+            if (!interceptorRequest) {
+                // 返回一个处于pending状态中的Promise，来取消原promise，避免进入then()回调
+                return new Promise(() => {});
+            }
+            this.options = interceptorRequest;
+        }
+
+        return new Promise<T>((resolve, reject) => {
+            options.complete = (response: any) => {
+                // 读取 meta 配置
+                const meta = options.meta || this.config.meta || {};
+                const originalData = meta.originalData ?? false;
+                // 拦截器处理，加入request的配置参数
+                response.config = options;
+                if (originalData) {
+                    // 判断是否存在拦截器
+                    if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+                        const resInterceptors = this.interceptor.response(response);
+                        // 如果拦截器不返回false，就将拦截器返回的内容给请求的then回调
+                        if (resInterceptors !== false) {
+                            resolve(resInterceptors);
+                        } else {
+                            // 如果拦截器返回false，意味着拦截器定义者认为返回有问题，直接接入catch回调
+                            reject(response);
+                        }
+                    } else {
+                        // 如果要求返回原始数据，就算没有拦截器，也返回最原始的数据
+                        resolve(response);
+                    }
+                } else {
+                    if (response.statusCode === 200) {
+                        if (this.interceptor.response && typeof this.interceptor.response === 'function') {
+                            const resInterceptors = this.interceptor.response(response.data);
+                            if (resInterceptors !== false) {
+                                resolve(resInterceptors);
+                            } else {
+                                reject(response.data);
+                            }
+                        } else {
+                            // 如果不是返回原始数据(originalData=false)，且没有拦截器的情况下，返回纯数据给then回调
+                            resolve(response.data);
+                        }
+                    } else {
+                        reject(response);
+                    }
+                }
+            };
+            // 判断用户传递的URL是否http开头
+            options.url =
+                options.url && options.url.indexOf('http') !== 0
+                    ? this.config.baseUrl + (options.url.indexOf('/') === 0 ? options.url : `/${options.url}`)
+                    : options.url;
+            uni.request(options);
+        });
+    }
+
+    get<T = unknown>(
+        url: string,
+        data: any = {},
+        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
+    ): Promise<T> {
+        return this.request<T>({
+            method: 'GET',
+            url,
+            data,
+            header: options.header,
+            meta: options.meta
+        });
+    }
+
+    post<T = unknown>(
+        url: string,
+        data: any = {},
+        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
+    ): Promise<T> {
+        return this.request<T>({
+            url,
+            method: 'POST',
+            data,
+            header: options.header,
+            meta: options.meta
+        });
+    }
+
+    put<T = unknown>(
+        url: string,
+        data: any = {},
+        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
+    ): Promise<T> {
+        return this.request<T>({
+            url,
+            method: 'PUT',
+            data,
+            header: options.header,
+            meta: options.meta
+        });
+    }
+
+    delete<T = unknown>(
+        url: string,
+        data: any = {},
+        options: { header?: Record<string, any>; meta?: RequestMeta } = {}
+    ): Promise<T> {
+        return this.request<T>({
+            url,
+            method: 'DELETE',
+            data,
+            header: options.header,
+            meta: options.meta
+        });
+    }
+}
+
+// 插件化导出，支持 app.use(http, { interceptor })
+const httpInstance = new Request();
+
+interface HttpPluginOptions {
+    requestConfig?: Partial<RequestConfig>;
+    interceptor?: RequestInterceptor;
+}
+
+// 全局导出，支持 import { httpPlugin } from 'uview-pro'
+const httpPlugin = {
+    install(app: any, options: HttpPluginOptions = {}) {
+        if (options.interceptor) {
+            const { request, response } = options.interceptor;
+            if (request) httpInstance.interceptor.request = request;
+            if (response) httpInstance.interceptor.response = response;
+        }
+        if (options.requestConfig) {
+            httpInstance.setConfig(options.requestConfig);
+        }
+        app.config.globalProperties.$http = httpInstance;
+    }
+};
+
+// 全局导出，支持 import { http } from 'uview-pro'
+export { httpInstance as http };
+
+// 插件化导出，支持 app.use(http, { interceptor })
+export default httpPlugin;