axios-annotations 2.1.0 → 2.2.0

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/expect.d.ts

@@ -1,4 +1,4 @@
-import type {AxiosPromise} from "axios";
-
-export default function Expect<T, D = AxiosPromise<T>>(params: any): D;
-export {};
+import type {AxiosPromise} from "axios";
+
+export default function Expect<T, D = AxiosPromise<T>>(params: any): D;
+export {};

package/lib/core/expect.js

@@ -1,15 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-    value: true
-});
-exports["default"] = Expect;
-/**
- * 警告 Warning: <br/>
- * 仅用于仿冒使用装饰器的方法返回值，绕过IDE/Typescript的类型检查，获得代码提示功能。<br/>
- *
- * Only used to ensure the return value of a method that uses decorators,
- * bypassing IDE/Typescript type checking and obtaining code intelligence.
- */
-function Expect(params) {
-    return params;
-}
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: true
+});
+exports["default"] = Expect;
+/**
+ * 警告 Warning: <br/>
+ * 仅用于仿冒使用装饰器的方法返回值，绕过IDE/Typescript的类型检查，获得代码提示功能。<br/>
+ *
+ * Only used to ensure the return value of a method that uses decorators,
+ * bypassing IDE/Typescript type checking and obtaining code intelligence.
+ */
+function Expect(params) {
+    return params;
+}

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/lib/core/service.d.ts

@@ -35,8 +35,8 @@ export default class Service {
     _for: Record<string, string>;
     _features: Record<string, QueryStringEncodeFeatures>;
     constructor(path?: any);
-    get config(): Config;
-    set config(value: Config);
+    get config(): Config<import("axios").AxiosStatic, import("axios").AxiosInstance>;
+    set config(value: Config<import("axios").AxiosStatic, import("axios").AxiosInstance>);
     get path(): string;
     set path(value: string);
     params(id: string, name: string, config?: RequestParamEncodeRule): void;

package/lib/decorator/delete-mapping.d.ts

@@ -1 +1 @@
-export default function DeleteMapping(path?: string): MethodDecorator;
+export default function DeleteMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/get-mapping.d.ts

@@ -1 +1 @@
-export default function GetMapping(path?: string): MethodDecorator;
+export default function GetMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/patch-mapping.d.ts

@@ -1 +1 @@
-export default function PatchMapping(path?: string): MethodDecorator;
+export default function PatchMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/post-mapping.d.ts

@@ -1 +1 @@
-export default function PostMapping(path?: string): MethodDecorator;
+export default function PostMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/put-mapping.d.ts

@@ -1 +1 @@
-export default function PutMapping(path?: string): MethodDecorator;
+export default function PutMapping<M = undefined>(path?: string): MethodDecorator;

package/lib/decorator/request-mapping.d.ts

@@ -1,3 +1,3 @@
 type DecoratorTargetType<M> = M extends string ? MethodDecorator : ClassDecorator;
-export default function RequestMapping<M = undefined>(path: string, method?: M): DecoratorTargetType<M>;
+export default function RequestMapping<M = undefined>(path: string, method?: M | string): DecoratorTargetType<M>;
 export {};

package/package.json

@@ -1,16 +1,16 @@
-{
-  "name": "axios-annotations",
-  "version": "2.1.0",
-  "description": "HTTP client library uses Axios without Typescript.",
-  "main": "index.js",
-  "miniprogram": "lib",
-  "miniprogramRoot": "lib",
-  "keywords": [
-    "axios",
-    "axios-annotations",
-    "axios-decorators"
-  ],
-  "author": "sitorhy",
-  "license": "MIT",
-  "homepage": "https://github.com/sitorhy/axios-annotations#readme"
-}
+{
+  "name": "axios-annotations",
+  "version": "2.2.0",
+  "description": "HTTP client library uses Axios without Typescript.",
+  "main": "index.js",
+  "miniprogram": "lib",
+  "miniprogramRoot": "lib",
+  "keywords": [
+    "axios",
+    "axios-annotations",
+    "axios-decorators"
+  ],
+  "author": "sitorhy",
+  "license": "MIT",
+  "homepage": "https://github.com/sitorhy/axios-annotations#readme"
+}