@midwayjs/axios 3.19.2 → 3.20.1-beta.1

package/README.md

@@ -9,4 +9,4 @@ Document: [https://midwayjs.org](https://midwayjs.org)
 
 ## License
 
-[MIT]((http://github.com/midwayjs/midway/blob/master/LICENSE))
+[MIT]((https://github.com/midwayjs/midway/blob/master/LICENSE))

package/dist/config.default.d.ts

@@ -0,0 +1,8 @@
+/**
+ * 默认配置
+ */
+declare const _default: {
+    axios: {};
+};
+export default _default;
+//# sourceMappingURL=config.default.d.ts.map

package/dist/config.default.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+/**
+ * 默认配置
+ */
+exports.default = {
+    axios: {},
+};
+//# sourceMappingURL=config.default.js.map

package/dist/configuration.d.ts

@@ -1,4 +1,5 @@
+import { IMidwayContainer } from '@midwayjs/core';
 export declare class AxiosConfiguration {
-    onReady(container: any): Promise<void>;
+    onReady(container: IMidwayContainer): Promise<void>;
 }
 //# sourceMappingURL=configuration.d.ts.map

package/dist/configuration.js

@@ -8,10 +8,11 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AxiosConfiguration = void 0;
 const core_1 = require("@midwayjs/core");
-const serviceManager_1 = require("./serviceManager");
+const config_default_1 = require("./config.default");
+const http_service_factory_1 = require("./http-service.factory");
 let AxiosConfiguration = class AxiosConfiguration {
     async onReady(container) {
-        await container.getAsync(serviceManager_1.HttpServiceFactory);
+        await container.getAsync(http_service_factory_1.HttpServiceFactory);
     }
 };
 AxiosConfiguration = __decorate([
@@ -19,9 +20,7 @@ AxiosConfiguration = __decorate([
         namespace: 'axios',
         importConfigs: [
             {
-                default: {
-                    axios: {},
-                },
+                default: config_default_1.default,
             },
         ],
         importConfigFilter: config => {

package/dist/{serviceManager.d.ts → http-service.d.ts}

@@ -1,15 +1,9 @@
-import type { AxiosInstance, AxiosRequestConfig, AxiosResponse, CreateAxiosDefaults } from 'axios';
-import { ServiceFactory } from '@midwayjs/core';
-import { AxiosHttpService } from './interface';
-export declare class HttpServiceFactory extends ServiceFactory<AxiosInstance> {
-    axiosConfig: any;
-    init(): Promise<void>;
-    protected createClient(config: CreateAxiosDefaults, clientName: any): Promise<AxiosInstance>;
-    getName(): string;
-}
-export declare class HttpService implements AxiosHttpService {
+import { Axios } from 'axios';
+import { MidwayAxiosRequestConfig as AxiosRequestConfig, MidwayAxiosResponse as AxiosResponse } from './interface';
+export declare class HttpService implements Axios {
     private instance;
     private serviceFactory;
+    protected init(): Promise<void>;
     get defaults(): Omit<import("axios").AxiosDefaults<any>, "headers"> & {
         headers: import("axios").HeadersDefaults & {
             [key: string]: import("axios").AxiosHeaderValue;
@@ -17,9 +11,8 @@ export declare class HttpService implements AxiosHttpService {
     };
     get interceptors(): {
         request: import("axios").AxiosInterceptorManager<import("axios").InternalAxiosRequestConfig<any>>;
-        response: import("axios").AxiosInterceptorManager<AxiosResponse<any, any>>;
+        response: import("axios").AxiosInterceptorManager<import("axios").AxiosResponse<any, any>>;
     };
-    protected init(): Promise<void>;
     getUri(config?: AxiosRequestConfig): string;
     request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D>): Promise<R>;
     get<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
@@ -33,4 +26,4 @@ export declare class HttpService implements AxiosHttpService {
     putForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
     patchForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
 }
-//# sourceMappingURL=serviceManager.d.ts.map
+//# sourceMappingURL=http-service.d.ts.map

package/dist/http-service.factory.d.ts

@@ -0,0 +1,9 @@
+import { ServiceFactory } from '@midwayjs/core';
+import { AxiosInstance, CreateAxiosDefaults } from 'axios';
+export declare class HttpServiceFactory extends ServiceFactory<AxiosInstance> {
+    axiosConfig: any;
+    init(): Promise<void>;
+    getName(): string;
+    protected createClient(config: CreateAxiosDefaults, clientName: string): Promise<AxiosInstance>;
+}
+//# sourceMappingURL=http-service.factory.d.ts.map

package/dist/http-service.factory.js

@@ -0,0 +1,50 @@
+"use strict";
+var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
+    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
+    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
+    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+    return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+var __metadata = (this && this.__metadata) || function (k, v) {
+    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HttpServiceFactory = void 0;
+const core_1 = require("@midwayjs/core");
+const axios_1 = require("axios");
+let HttpServiceFactory = class HttpServiceFactory extends core_1.ServiceFactory {
+    async init() {
+        let axiosConfig = this.axiosConfig;
+        if (!this.axiosConfig['clients']) {
+            axiosConfig = {
+                default: {},
+                clients: {
+                    default: this.axiosConfig,
+                },
+            };
+        }
+        await this.initClients(axiosConfig);
+    }
+    getName() {
+        return 'axios';
+    }
+    async createClient(config, clientName) {
+        return axios_1.default.create(config);
+    }
+};
+__decorate([
+    (0, core_1.Config)('axios'),
+    __metadata("design:type", Object)
+], HttpServiceFactory.prototype, "axiosConfig", void 0);
+__decorate([
+    (0, core_1.Init)(),
+    __metadata("design:type", Function),
+    __metadata("design:paramtypes", []),
+    __metadata("design:returntype", Promise)
+], HttpServiceFactory.prototype, "init", null);
+HttpServiceFactory = __decorate([
+    (0, core_1.Provide)(),
+    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
+], HttpServiceFactory);
+exports.HttpServiceFactory = HttpServiceFactory;
+//# sourceMappingURL=http-service.factory.js.map

package/dist/{serviceManager.js → http-service.js}

@@ -9,58 +9,23 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.HttpService = exports.HttpServiceFactory = void 0;
-const axios_1 = require("axios");
+exports.HttpService = void 0;
 const core_1 = require("@midwayjs/core");
-let HttpServiceFactory = class HttpServiceFactory extends core_1.ServiceFactory {
+const http_service_factory_1 = require("./http-service.factory");
+let HttpService = class HttpService {
     async init() {
-        let axiosConfig = this.axiosConfig;
-        if (!this.axiosConfig['clients']) {
-            axiosConfig = {
-                default: {},
-                clients: {
-                    default: this.axiosConfig,
-                },
-            };
+        const clientName = this.serviceFactory.getDefaultClientName() || 'default';
+        this.instance = this.serviceFactory.get(clientName);
+        if (!this.instance) {
+            throw new core_1.MidwayCommonError('axios default instance not found.');
         }
-        await this.initClients(axiosConfig);
-    }
-    async createClient(config, clientName) {
-        return axios_1.default.create(config);
-    }
-    getName() {
-        return 'axios';
     }
-};
-__decorate([
-    (0, core_1.Config)('axios'),
-    __metadata("design:type", Object)
-], HttpServiceFactory.prototype, "axiosConfig", void 0);
-__decorate([
-    (0, core_1.Init)(),
-    __metadata("design:type", Function),
-    __metadata("design:paramtypes", []),
-    __metadata("design:returntype", Promise)
-], HttpServiceFactory.prototype, "init", null);
-HttpServiceFactory = __decorate([
-    (0, core_1.Provide)(),
-    (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
-], HttpServiceFactory);
-exports.HttpServiceFactory = HttpServiceFactory;
-let HttpService = class HttpService {
     get defaults() {
         return this.instance.defaults;
     }
     get interceptors() {
         return this.instance.interceptors;
     }
-    async init() {
-        var _a, _b;
-        this.instance = this.serviceFactory.get(((_b = (_a = this.serviceFactory).getDefaultClientName) === null || _b === void 0 ? void 0 : _b.call(_a)) || 'default');
-        if (!this.instance) {
-            throw new core_1.MidwayCommonError('axios default instance not found.');
-        }
-    }
     getUri(config) {
         return this.instance.getUri(config);
     }
@@ -100,7 +65,7 @@ let HttpService = class HttpService {
 };
 __decorate([
     (0, core_1.Inject)(),
-    __metadata("design:type", HttpServiceFactory)
+    __metadata("design:type", http_service_factory_1.HttpServiceFactory)
 ], HttpService.prototype, "serviceFactory", void 0);
 __decorate([
     (0, core_1.Init)(),
@@ -113,4 +78,4 @@ HttpService = __decorate([
     (0, core_1.Scope)(core_1.ScopeEnum.Singleton)
 ], HttpService);
 exports.HttpService = HttpService;
-//# sourceMappingURL=serviceManager.js.map
+//# sourceMappingURL=http-service.js.map

package/dist/index.d.ts

@@ -1,12 +1,12 @@
 import axios from 'axios';
 import * as Axios from 'axios';
 export { AxiosConfiguration as Configuration } from './configuration';
+export * from './http-service.factory';
+export * from './http-service';
 export * from './interface';
-export * from './serviceManager';
 export { 
 /**
  * @deprecated Use `Axios` directly
  */
-axios, };
-export { Axios };
+axios, Axios, };
 //# sourceMappingURL=index.d.ts.map

package/dist/index.js

@@ -21,6 +21,7 @@ const Axios = require("axios");
 exports.Axios = Axios;
 var configuration_1 = require("./configuration");
 Object.defineProperty(exports, "Configuration", { enumerable: true, get: function () { return configuration_1.AxiosConfiguration; } });
+__exportStar(require("./http-service.factory"), exports);
+__exportStar(require("./http-service"), exports);
 __exportStar(require("./interface"), exports);
-__exportStar(require("./serviceManager"), exports);
 //# sourceMappingURL=index.js.map

package/dist/interface.d.ts

@@ -1,21 +1,6 @@
-import type { AxiosRequestConfig, AxiosResponse, AxiosInterceptorManager, AxiosDefaults } from 'axios';
-export interface AxiosHttpService {
-    defaults: AxiosDefaults;
-    interceptors: {
-        request: AxiosInterceptorManager<AxiosRequestConfig>;
-        response: AxiosInterceptorManager<AxiosResponse>;
-    };
-    getUri(config?: AxiosRequestConfig): string;
-    request<T = any, R = AxiosResponse<T>, D = any>(config: AxiosRequestConfig<D>): Promise<R>;
-    get<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
-    delete<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
-    head<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
-    options<T = any, R = AxiosResponse<T>, D = any>(url: string, config?: AxiosRequestConfig<D>): Promise<R>;
-    post<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-    put<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-    patch<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-    postForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-    putForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-    patchForm<T = any, R = AxiosResponse<T>, D = any>(url: string, data?: D, config?: AxiosRequestConfig<D>): Promise<R>;
-}
+import { AxiosRequestConfig, AxiosResponse } from 'axios';
+export type MidwayAxiosRequestConfig<D = any, CONFIG = any> = AxiosRequestConfig<D> & CONFIG;
+export type MidwayAxiosResponse<T = any, D = any, CONFIG = any> = AxiosResponse<T, D> & {
+    config: MidwayAxiosRequestConfig<D, CONFIG>;
+};
 //# sourceMappingURL=interface.d.ts.map

package/index.d.ts

@@ -1,4 +1,4 @@
-import { AxiosRequestConfig } from 'axios';
+import { MidwayAxiosRequestConfig as AxiosRequestConfig } from './dist/index';
 
 export * from './dist/index';
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@midwayjs/axios",
   "description": "midway http client with axios",
-  "version": "3.19.2",
+  "version": "3.20.1-beta.1",
   "main": "dist/index.js",
   "typings": "index.d.ts",
   "files": [
@@ -10,8 +10,8 @@
     "index.d.ts"
   ],
   "devDependencies": {
-    "@midwayjs/core": "^3.19.0",
-    "@midwayjs/mock": "^3.19.2",
+    "@midwayjs/core": "^3.20.0",
+    "@midwayjs/mock": "^3.20.0",
     "nock": "13.5.6"
   },
   "dependencies": {
@@ -36,6 +36,5 @@
   "repository": {
     "type": "git",
     "url": "https://github.com/midwayjs/midway.git"
-  },
-  "gitHead": "57fd034be94897fb819b0d9ef776de0b9923ab0f"
+  }
 }

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2013 - Now midwayjs
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-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.