Merge pull request #96 from GuoXiCheng/dev-c

update type

package.json

@@ -1,6 +1,6 @@
 {
   "name": "tiny-crud",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "Lightweight Data Repository Based on Git Issue API",
   "main": "dist/bundle.cjs.js",
   "module": "dist/bundle.esm.js",

src/index.ts

@@ -20,7 +20,5 @@ export { GithubUser } from './repository-lib/github/github-user';
 
 export { GiteeUser } from './repository-lib/gitee/gitee-user';
 
-export { AxiosRequest } from './request-lib/axios/axios-request';
-
-export { WxRequest } from './request-lib/wx/wx-request';
+export { BaseRequest } from './request-lib/base/base-request';
 

src/request-lib/axios/axios-request.ts

@@ -1,19 +1,18 @@
-import { AxiosInstance } from 'axios';
 import { BaseRequest } from '../base/base-request';
 import { RequestOptions } from '../base/request-options';
 import { RequestMethods } from '../base/request-methods';
 
 export class AxiosRequest extends BaseRequest {
-    private axios: AxiosInstance;
+    private axios: any;
     constructor(
         public options: RequestOptions
     ) {
         super(options);
-        this.axios = options.httpClient as AxiosInstance;
+        this.axios = options.httpClient;
     }
 
     protected async sendRequest<T>(method: RequestMethods, url: string, body?: string, params?: any): Promise<T> {
-        const response = await this.axios.request<T>({
+        const response = await this.axios.request({
             url,
             method,
             headers: {

src/request-lib/base/request-options.ts

@@ -1,16 +1,16 @@
 import { GiteeOptions } from "../../repository-lib/gitee/gitee-options";
 import { GithubOptions } from "../../repository-lib/github/github-options";
 import { GitlabOptions } from "../../repository-lib/gitlab/gitlab-options";
-import { AxiosOptions } from "../axios/axios-options";
-import { WxOptions } from "../wx/wx-options";
 
 export type RequestOptions = {
+    httpLib: "axios" | "wx";
+    httpClient: any;
+    accessToken: string;
+
     baseURL?: string;
     issueNumber?: string;
-    accessToken: string;
 }
     & (GiteeOptions | GithubOptions | GitlabOptions)
-    & (AxiosOptions | WxOptions)
     & (RequestWithEncrypt | RequestWithoutEncrypt);
 
 type RequestWithEncrypt = {

src/request-lib/create-request.ts

@@ -1,12 +1,11 @@
-import { AxiosInstance } from "axios";
 import { RequestType } from "../enums";
 import { AxiosRequest } from "./axios/axios-request";
 import { WxRequest } from "./wx/wx-request";
-import { WxInstance } from "./wx/wx-interface";
 import { RequestOptions } from "./base/request-options";
+import { BaseRequest } from "./base/base-request";
 
 
-export function createRequest(options: RequestOptions) {
+export function createRequest(options: RequestOptions): BaseRequest {
     const { httpLib, httpClient } = options;
     switch (httpLib) {
         case RequestType.axios:
@@ -23,7 +22,7 @@ export function createRequest(options: RequestOptions) {
 }
 
 
-function isAxiosInstance(instance: any): instance is AxiosInstance {
+function isAxiosInstance(instance: any): Boolean {
     return instance
         && typeof instance.get === 'function'
         && typeof instance.post === 'function'
@@ -32,6 +31,6 @@ function isAxiosInstance(instance: any): instance is AxiosInstance {
         && typeof instance.patch === 'function';
 }
 
-function isWxInstance(instance: any): instance is WxInstance {
+function isWxInstance(instance: any): Boolean {
     return instance && typeof instance.request === 'function';
 }

src/request-lib/wx/wx-request.ts

@@ -3,17 +3,17 @@ import { RequestMethods } from '../base/request-methods';
 import { RequestOptions } from '../base/request-options';
 
 export class WxRequest extends BaseRequest {
-    private wx: WechatMiniprogram.Wx;
+    private wx: any;
     constructor(
         public options: RequestOptions
     ) {
         super(options);
-        this.wx = options.httpClient as WechatMiniprogram.Wx;
+        this.wx = options.httpClient;
     }
 
     protected async sendRequest<T>(method: RequestMethods, url: string, body?: string, params?: any): Promise<T> {
         return new Promise((resolve, reject) => {
-            const options: WechatMiniprogram.RequestOption = {
+            const options = {
                 url,
                 method,
                 ...(body && { data: { body } }),