axios-annotations 2.1.0 → 2.1.1

package/README.md

@@ -131,9 +131,9 @@ tsconfig.json / jsconfig.json
 ```javascript
 import {
   Service,
-  equestConfig,
-  equestParam,
-  equestMapping,
+  RequestConfig,
+  RequestParam,
+  RequestMapping,
   RequestBody,
   RequestHeader,
   IgnoreResidualParams

package/lib/core/config.d.ts

@@ -1,10 +1,10 @@
 import AxiosStaticInstanceProvider from "./provider";
-import type { AxiosInstance } from "axios";
-export type ConfigPlugin = (axios: AxiosInstance, config: Config) => void;
+import type { AxiosInstance, AxiosStatic } from "axios";
+export type ConfigPlugin<StaticType = AxiosStatic, InstanceType = AxiosInstance> = (axios: InstanceType, config: Config<StaticType, InstanceType>) => void;
 export type PartialConstructorString = string | null;
 export type PartialConstructorNumber = number | null;
-export type PartialPluginConstructorPlugins = ConfigPlugin[] | null;
-export default class Config {
+export type PartialPluginConstructorPlugins<StaticType = AxiosStatic, InstanceType = AxiosInstance> = ConfigPlugin<StaticType, InstanceType>[] | null;
+export default class Config<StaticType = AxiosStatic, InstanceType = AxiosInstance> {
     private _host;
     private _port;
     private _protocol;
@@ -17,11 +17,11 @@ export default class Config {
         host?: PartialConstructorString;
         port?: PartialConstructorNumber;
         prefix?: PartialConstructorString;
-        plugins?: PartialPluginConstructorPlugins;
-        axiosProvider?: AxiosStaticInstanceProvider;
+        plugins?: PartialPluginConstructorPlugins<StaticType, InstanceType>;
+        axiosProvider?: AxiosStaticInstanceProvider<StaticType>;
     });
     static forName(name: string): Config | null;
-    init(protocol: PartialConstructorString, host: PartialConstructorString, port: PartialConstructorNumber, prefix: PartialConstructorString, plugins: PartialPluginConstructorPlugins): void;
+    init(protocol: PartialConstructorString, host: PartialConstructorString, port: PartialConstructorNumber, prefix: PartialConstructorString, plugins: PartialPluginConstructorPlugins<StaticType, InstanceType>): void;
     get host(): string;
     set host(value: string);
     get port(): number;
@@ -40,21 +40,21 @@ export default class Config {
      * return "http://localhost:8080/a"
      */
     get baseURL(): string;
-    get plugins(): PartialPluginConstructorPlugins;
-    set plugins(value: PartialPluginConstructorPlugins);
-    get axiosProvider(): AxiosStaticInstanceProvider;
-    set axiosProvider(value: AxiosStaticInstanceProvider);
+    get plugins(): PartialPluginConstructorPlugins<StaticType, InstanceType>;
+    set plugins(value: PartialPluginConstructorPlugins<StaticType, InstanceType>);
+    get axiosProvider(): AxiosStaticInstanceProvider<StaticType>;
+    set axiosProvider(value: AxiosStaticInstanceProvider<StaticType>);
     /**
      * register config global and return self.
      * @param name
      * @return {Config} config self
      */
-    register(name: string): Config;
+    register(name: string): Config<StaticType, InstanceType>;
     /**
      * remove self from global config store.
      * @return {Config} - config self
      */
-    unregister(): Config;
-    requestAxiosInstance(): Promise<AxiosInstance>;
+    unregister(): Config<StaticType, InstanceType>;
+    requestAxiosInstance(): Promise<InstanceType>;
 }
-export declare const config: Config;
+export declare const config: Config<AxiosStatic, AxiosInstance>;

package/lib/core/provider.d.ts

@@ -1,6 +1,6 @@
 import type { AxiosStatic } from "axios";
-export default class AxiosStaticInstanceProvider {
-    __instance: AxiosStatic | null;
-    provide(): Promise<AxiosStatic>;
-    get(): Promise<AxiosStatic>;
+export default class AxiosStaticInstanceProvider<StaticType = AxiosStatic> {
+    __instance: StaticType | null;
+    provide(): Promise<StaticType>;
+    get(): Promise<StaticType>;
 }

package/lib/core/provider.js

@@ -152,6 +152,12 @@ var AxiosStaticInstanceProvider = /** @class */ function() {
             return __generator(this, function(_b) {
                 switch(_b.label){
                     case 0:
+                        if (this.__instance) {
+                            return [
+                                2 /*return*/ ,
+                                this.__instance
+                            ];
+                        }
                         _a = this;
                         return [
                             4 /*yield*/ ,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "axios-annotations",
-  "version": "2.1.0",
+  "version": "2.1.1",
   "description": "HTTP client library uses Axios without Typescript.",
   "main": "index.js",
   "miniprogram": "lib",