@snail-js/api 0.1.21 → 0.1.22

package/dist/core/snailMethod.d.ts

@@ -1,5 +1,5 @@
 import { AxiosResponse, AxiosRequestConfig } from "axios";
-import { EventHandler, Strategy, ResponseData, SendRequest, StandardResponseData, SnailMethodEventType } from "../typings";
+import { Strategy, ResponseData, SendRequest, StandardResponseData, SnailSuccessListener, SnailErrorListener, SnailHitCacheListener, SnailFinishListener } from "../typings";
 import { SnailApi } from "./snailApi";
 /**
  * SnailMethod
@@ -14,8 +14,7 @@ export declare class SnailMethod<RT extends ResponseData = StandardResponseData>
     private Request;
     private Response;
     private Error;
-    private eventMap;
-    private onceWrapperMap;
+    private EventEmit;
     private propertyKey;
     private Url;
     private Path;
@@ -29,14 +28,10 @@ export declare class SnailMethod<RT extends ResponseData = StandardResponseData>
     private initVersion;
     private getExpireSources;
     private createRequest;
-    onSuccess: (handler: EventHandler<RT>) => void;
-    onError: (handler: EventHandler<RT>) => void;
-    onHitCache: (handler: EventHandler<RT>) => void;
-    onFinish: (handler: EventHandler<RT>) => void;
-    on: (eventName: SnailMethodEventType, handler: EventHandler<RT>) => void;
-    once: (eventName: SnailMethodEventType, handler: EventHandler<RT>) => void;
-    emit: (eventName: SnailMethodEventType, ...args: any) => boolean;
-    off: (eventName: SnailMethodEventType, handler: EventHandler<RT>) => void;
+    onSuccess: (listener: SnailSuccessListener<RT>) => void;
+    onError: <ErrorData = any>(listener: SnailErrorListener<RT, ErrorData>) => void;
+    onHitCache: (listener: SnailHitCacheListener<RT>) => void;
+    onFinish: (listener: SnailFinishListener<RT>) => void;
     private getCacheData;
     private setCacheData;
     get response(): AxiosResponse<RT, any>;

package/dist/eventEmmit/index.d.ts

@@ -0,0 +1 @@
+export * from "./snail.event";

package/dist/eventEmmit/snail.event.d.ts

@@ -0,0 +1,10 @@
+import { SnailEventListener } from "../typings";
+export declare class SnailEvent<DT = any> {
+    private eventMap;
+    private onceWrapperMap;
+    constructor();
+    on: <ErrorData = any>(eventName: string, listener: SnailEventListener<DT, ErrorData>) => void;
+    off: (eventName: string, listener: SnailEventListener<DT>) => void;
+    once: (eventName: string, listener: SnailEventListener<DT>) => void;
+    emit: (eventName: string, ...args: any) => boolean;
+}

package/dist/snail-api.js

@@ -3764,13 +3764,6 @@ class SseOptions {
     __publicField(this, "version");
   }
 }
-var EventType = /* @__PURE__ */ ((EventType2) => {
-  EventType2["Success"] = "success";
-  EventType2["Error"] = "error";
-  EventType2["hitCache"] = "hitCache";
-  EventType2["Finish"] = "finish";
-  return EventType2;
-})(EventType || {});
 function createCache(optios) {
   const { type } = optios;
   if (type === CacheType.Custom) {
@@ -3976,6 +3969,54 @@ const HitSource = (...sources) => {
     Reflect.defineMetadata(CACHE_EXPIRE_SOURCE_KEY, sources, target);
   };
 };
+class SnailEvent {
+  constructor() {
+    __publicField(this, "eventMap");
+    __publicField(this, "onceWrapperMap");
+    __publicField(this, "on", (eventName, listener) => {
+      if (typeof listener !== "function") {
+        throw new TypeError("Handler must be a function");
+      }
+      const listeners = this.eventMap.get(eventName) || /* @__PURE__ */ new Set();
+      listeners.add(listener);
+      this.eventMap.set(eventName, listeners);
+    });
+    __publicField(this, "off", (eventName, listener) => {
+      const listeners = this.eventMap.get(eventName);
+      if (!listeners) return;
+      if (this.onceWrapperMap.has(listener)) {
+        this.onceWrapperMap.delete(listener);
+      }
+      if (listeners.size === 0) {
+        this.eventMap.delete(eventName);
+      }
+    });
+    __publicField(this, "once", (eventName, listener) => {
+      const onceHandler = (data) => {
+        try {
+          listener.apply(this, [data]);
+        } finally {
+          this.off(eventName, onceHandler);
+          this.onceWrapperMap.delete(listener);
+        }
+      };
+      this.onceWrapperMap.set(listener, onceHandler);
+      this.on(eventName, onceHandler);
+    });
+    __publicField(this, "emit", (eventName, ...args) => {
+      const listeners = this.eventMap.get(eventName);
+      if (!listeners || listeners.size === 0) return false;
+      listeners.forEach((listener) => {
+        Promise.resolve().then(() => {
+          listener.apply(this, args);
+        });
+      });
+      return true;
+    });
+    this.eventMap = /* @__PURE__ */ new Map();
+    this.onceWrapperMap = /* @__PURE__ */ new Map();
+  }
+}
 const versionHandlers = {
   [VersioningType.Uri]: (version, versioning) => {
     const prefix = versioning.prefix || "v";
@@ -4029,8 +4070,9 @@ class SnailMethod {
     __publicField(this, "Request");
     __publicField(this, "Response");
     __publicField(this, "Error");
-    __publicField(this, "eventMap");
-    __publicField(this, "onceWrapperMap");
+    __publicField(this, "EventEmit");
+    // private eventMap: Map<string, Set<EventHandler>>;
+    // private onceWrapperMap: Map<EventHandler, EventHandler>;
     __publicField(this, "propertyKey");
     __publicField(this, "Url", "");
     __publicField(this, "Path", "");
@@ -4069,9 +4111,9 @@ class SnailMethod {
         const { data: data2 } = await this.getCacheData(serverName);
         this.enableLog() && console.log("getCacheData:", data2);
         if (data2) {
-          this.emit("hitCache", data2);
-          this.emit("success", data2);
-          this.emit("finish", data2);
+          this.EventEmit.emit("hitCache", data2);
+          this.EventEmit.emit("success", data2);
+          this.EventEmit.emit("finish", data2);
           return data2;
         }
       }
@@ -4092,8 +4134,8 @@ class SnailMethod {
         this.applyHitSource(serverName);
         isSpecial && console.log("isSpecial:", isSpecial);
         if (isSpecial) {
-          this.emit("success", response.data);
-          this.emit("finish", response.data);
+          this.EventEmit.emit("success", response.data);
+          this.EventEmit.emit("finish", response.data);
           return response;
         }
         !isSpecial && console.log("isSpecial:", isSpecial);
@@ -4102,71 +4144,31 @@ class SnailMethod {
           const statuCodeKey = key ?? "code";
           const data2 = response.data;
           if (rule(data2[statuCodeKey])) {
-            this.emit("success", response.data);
+            this.EventEmit.emit("success", response.data);
           } else {
-            this.emit("error", response.data);
+            this.EventEmit.emit("error", response.data);
           }
         }
         return response.data;
       } catch (error) {
-        this.emit("error", error);
-        this.emit("finish", error);
+        this.EventEmit.emit("error", error);
+        this.EventEmit.emit("finish", error);
         console.error(error);
         this.Error = error;
         return error;
       }
     });
-    __publicField(this, "onSuccess", (handler) => {
-      this.on("success", handler);
-    });
-    __publicField(this, "onError", (handler) => {
-      this.on("error", handler);
+    __publicField(this, "onSuccess", (listener) => {
+      this.EventEmit.on("success", listener);
     });
-    __publicField(this, "onHitCache", (handler) => {
-      this.on("hitCache", handler);
-    });
-    __publicField(this, "onFinish", (handler) => {
-      this.on("finish", handler);
-    });
-    __publicField(this, "on", (eventName, handler) => {
-      if (typeof handler !== "function") {
-        throw new TypeError("Handler must be a function");
-      }
-      const handlers = this.eventMap.get(eventName) || /* @__PURE__ */ new Set();
-      handlers.add(handler);
-      this.eventMap.set(eventName, handlers);
-    });
-    __publicField(this, "once", (eventName, handler) => {
-      const onceHandler = (data) => {
-        try {
-          handler.apply(this, [data]);
-        } finally {
-          this.off(eventName, onceHandler);
-          this.onceWrapperMap.delete(handler);
-        }
-      };
-      this.onceWrapperMap.set(handler, onceHandler);
-      this.on(eventName, onceHandler);
+    __publicField(this, "onError", (listener) => {
+      this.EventEmit.on("error", listener);
     });
-    __publicField(this, "emit", (eventName, ...args) => {
-      const handlers = this.eventMap.get(eventName);
-      if (!handlers || handlers.size === 0) return false;
-      handlers.forEach((handler) => {
-        Promise.resolve().then(() => {
-          handler.apply(this, args);
-        });
-      });
-      return true;
+    __publicField(this, "onHitCache", (listener) => {
+      this.EventEmit.on("hitCache", listener);
     });
-    __publicField(this, "off", (eventName, handler) => {
-      const handlers = this.eventMap.get(eventName);
-      if (!handlers) return;
-      if (handlers.has(handler)) {
-        handlers.delete(handler);
-      }
-      if (handlers.size === 0) {
-        this.eventMap.delete(eventName);
-      }
+    __publicField(this, "onFinish", (listener) => {
+      this.EventEmit.on("finish", listener);
     });
     __publicField(this, "registerStrategies", (...strategys) => {
       this.strategies.push(...strategys);
@@ -4177,12 +4179,7 @@ class SnailMethod {
     this.Args = args ?? [];
     this.init();
     this.enableLog() && console.log("url:", this.Url);
-    this.eventMap = /* @__PURE__ */ new Map();
-    this.onceWrapperMap = /* @__PURE__ */ new Map();
-    this.eventMap.set("success", /* @__PURE__ */ new Set());
-    this.eventMap.set("hitCache", /* @__PURE__ */ new Set());
-    this.eventMap.set("error", /* @__PURE__ */ new Set());
-    this.eventMap.set("finish", /* @__PURE__ */ new Set());
+    this.EventEmit = new SnailEvent();
   }
   init() {
     const methodOptions = this.getMethodOptions();
@@ -4820,7 +4817,6 @@ export {
   CacheType,
   Data,
   Delete,
-  EventType,
   Get,
   Head,
   HitSource,

package/dist/snail-api.umd.cjs

@@ -3768,13 +3768,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "version");
     }
   }
-  var EventType = /* @__PURE__ */ ((EventType2) => {
-    EventType2["Success"] = "success";
-    EventType2["Error"] = "error";
-    EventType2["hitCache"] = "hitCache";
-    EventType2["Finish"] = "finish";
-    return EventType2;
-  })(EventType || {});
   function createCache(optios) {
     const { type } = optios;
     if (type === CacheType.Custom) {
@@ -3980,6 +3973,54 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       Reflect.defineMetadata(CACHE_EXPIRE_SOURCE_KEY, sources, target);
     };
   };
+  class SnailEvent {
+    constructor() {
+      __publicField(this, "eventMap");
+      __publicField(this, "onceWrapperMap");
+      __publicField(this, "on", (eventName, listener) => {
+        if (typeof listener !== "function") {
+          throw new TypeError("Handler must be a function");
+        }
+        const listeners = this.eventMap.get(eventName) || /* @__PURE__ */ new Set();
+        listeners.add(listener);
+        this.eventMap.set(eventName, listeners);
+      });
+      __publicField(this, "off", (eventName, listener) => {
+        const listeners = this.eventMap.get(eventName);
+        if (!listeners) return;
+        if (this.onceWrapperMap.has(listener)) {
+          this.onceWrapperMap.delete(listener);
+        }
+        if (listeners.size === 0) {
+          this.eventMap.delete(eventName);
+        }
+      });
+      __publicField(this, "once", (eventName, listener) => {
+        const onceHandler = (data) => {
+          try {
+            listener.apply(this, [data]);
+          } finally {
+            this.off(eventName, onceHandler);
+            this.onceWrapperMap.delete(listener);
+          }
+        };
+        this.onceWrapperMap.set(listener, onceHandler);
+        this.on(eventName, onceHandler);
+      });
+      __publicField(this, "emit", (eventName, ...args) => {
+        const listeners = this.eventMap.get(eventName);
+        if (!listeners || listeners.size === 0) return false;
+        listeners.forEach((listener) => {
+          Promise.resolve().then(() => {
+            listener.apply(this, args);
+          });
+        });
+        return true;
+      });
+      this.eventMap = /* @__PURE__ */ new Map();
+      this.onceWrapperMap = /* @__PURE__ */ new Map();
+    }
+  }
   const versionHandlers = {
     [VersioningType.Uri]: (version, versioning) => {
       const prefix = versioning.prefix || "v";
@@ -4033,8 +4074,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       __publicField(this, "Request");
       __publicField(this, "Response");
       __publicField(this, "Error");
-      __publicField(this, "eventMap");
-      __publicField(this, "onceWrapperMap");
+      __publicField(this, "EventEmit");
+      // private eventMap: Map<string, Set<EventHandler>>;
+      // private onceWrapperMap: Map<EventHandler, EventHandler>;
       __publicField(this, "propertyKey");
       __publicField(this, "Url", "");
       __publicField(this, "Path", "");
@@ -4073,9 +4115,9 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           const { data: data2 } = await this.getCacheData(serverName);
           this.enableLog() && console.log("getCacheData:", data2);
           if (data2) {
-            this.emit("hitCache", data2);
-            this.emit("success", data2);
-            this.emit("finish", data2);
+            this.EventEmit.emit("hitCache", data2);
+            this.EventEmit.emit("success", data2);
+            this.EventEmit.emit("finish", data2);
             return data2;
           }
         }
@@ -4096,8 +4138,8 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
           this.applyHitSource(serverName);
           isSpecial && console.log("isSpecial:", isSpecial);
           if (isSpecial) {
-            this.emit("success", response.data);
-            this.emit("finish", response.data);
+            this.EventEmit.emit("success", response.data);
+            this.EventEmit.emit("finish", response.data);
             return response;
           }
           !isSpecial && console.log("isSpecial:", isSpecial);
@@ -4106,71 +4148,31 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
             const statuCodeKey = key ?? "code";
             const data2 = response.data;
             if (rule(data2[statuCodeKey])) {
-              this.emit("success", response.data);
+              this.EventEmit.emit("success", response.data);
             } else {
-              this.emit("error", response.data);
+              this.EventEmit.emit("error", response.data);
             }
           }
           return response.data;
         } catch (error) {
-          this.emit("error", error);
-          this.emit("finish", error);
+          this.EventEmit.emit("error", error);
+          this.EventEmit.emit("finish", error);
           console.error(error);
           this.Error = error;
           return error;
         }
       });
-      __publicField(this, "onSuccess", (handler) => {
-        this.on("success", handler);
-      });
-      __publicField(this, "onError", (handler) => {
-        this.on("error", handler);
+      __publicField(this, "onSuccess", (listener) => {
+        this.EventEmit.on("success", listener);
       });
-      __publicField(this, "onHitCache", (handler) => {
-        this.on("hitCache", handler);
-      });
-      __publicField(this, "onFinish", (handler) => {
-        this.on("finish", handler);
-      });
-      __publicField(this, "on", (eventName, handler) => {
-        if (typeof handler !== "function") {
-          throw new TypeError("Handler must be a function");
-        }
-        const handlers = this.eventMap.get(eventName) || /* @__PURE__ */ new Set();
-        handlers.add(handler);
-        this.eventMap.set(eventName, handlers);
-      });
-      __publicField(this, "once", (eventName, handler) => {
-        const onceHandler = (data) => {
-          try {
-            handler.apply(this, [data]);
-          } finally {
-            this.off(eventName, onceHandler);
-            this.onceWrapperMap.delete(handler);
-          }
-        };
-        this.onceWrapperMap.set(handler, onceHandler);
-        this.on(eventName, onceHandler);
+      __publicField(this, "onError", (listener) => {
+        this.EventEmit.on("error", listener);
       });
-      __publicField(this, "emit", (eventName, ...args) => {
-        const handlers = this.eventMap.get(eventName);
-        if (!handlers || handlers.size === 0) return false;
-        handlers.forEach((handler) => {
-          Promise.resolve().then(() => {
-            handler.apply(this, args);
-          });
-        });
-        return true;
+      __publicField(this, "onHitCache", (listener) => {
+        this.EventEmit.on("hitCache", listener);
       });
-      __publicField(this, "off", (eventName, handler) => {
-        const handlers = this.eventMap.get(eventName);
-        if (!handlers) return;
-        if (handlers.has(handler)) {
-          handlers.delete(handler);
-        }
-        if (handlers.size === 0) {
-          this.eventMap.delete(eventName);
-        }
+      __publicField(this, "onFinish", (listener) => {
+        this.EventEmit.on("finish", listener);
       });
       __publicField(this, "registerStrategies", (...strategys) => {
         this.strategies.push(...strategys);
@@ -4181,12 +4183,7 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
       this.Args = args ?? [];
       this.init();
       this.enableLog() && console.log("url:", this.Url);
-      this.eventMap = /* @__PURE__ */ new Map();
-      this.onceWrapperMap = /* @__PURE__ */ new Map();
-      this.eventMap.set("success", /* @__PURE__ */ new Set());
-      this.eventMap.set("hitCache", /* @__PURE__ */ new Set());
-      this.eventMap.set("error", /* @__PURE__ */ new Set());
-      this.eventMap.set("finish", /* @__PURE__ */ new Set());
+      this.EventEmit = new SnailEvent();
     }
     init() {
       const methodOptions = this.getMethodOptions();
@@ -4823,7 +4820,6 @@ var __publicField = (obj, key, value) => __defNormalProp(obj, typeof key !== "sy
   exports2.CacheType = CacheType;
   exports2.Data = Data;
   exports2.Delete = Delete;
-  exports2.EventType = EventType;
   exports2.Get = Get;
   exports2.Head = Head;
   exports2.HitSource = HitSource;

package/dist/typings/apiProxy.d.ts

@@ -6,7 +6,7 @@ export type ApiResponse<T> = Promise<{
     hitCache?: boolean;
 }>;
 export type ApiProxy<T extends object, RT extends ResponseData = Omit<StandardResponseData, "data">, DK extends string = "data"> = {
-    [K in keyof T]: T[K] extends (...args: infer A) => any ? RT extends SpecialResponseData ? <RD>(...args: A) => SnailMethod<RD extends SpecialResponseData ? RD : never> : <RD>(...args: A) => RD extends SpecialResponseData ? SnailMethod<RD> : SnailMethod<RT & {
+    [K in keyof T]: T[K] extends (...args: infer A) => any ? RT extends SpecialResponseData ? <RD = unknown>(...args: A) => SnailMethod<RD extends SpecialResponseData ? RD : never> : <RD = unknown>(...args: A) => RD extends SpecialResponseData ? SnailMethod<RD> : SnailMethod<RT & {
         [KK in DK]: RD;
     }> : T[K];
 };

package/dist/typings/index.d.ts

@@ -10,3 +10,4 @@ export * from "./strategy";
 export * from "./apiProxy";
 export * from "./sse";
 export * from "./snail.method";
+export * from "./snail.event";

package/dist/typings/snail.event.d.ts

@@ -0,0 +1,6 @@
+import { AxiosResponse } from "axios";
+export type SnailSuccessListener<T = any> = (data?: T) => void;
+export type SnailErrorListener<T = any, ErrorData = any> = (response?: AxiosResponse<T> | Error | ErrorData) => void;
+export type SnailHitCacheListener<T = any> = (cacheData?: T) => void;
+export type SnailFinishListener<T = any> = (data?: T) => void;
+export type SnailEventListener<T = any, ErrorData = any> = SnailSuccessListener<T> | SnailErrorListener<T, ErrorData> | SnailHitCacheListener<T> | SnailFinishListener<T>;

package/dist/typings/snail.method.d.ts

@@ -1,11 +1,3 @@
 import { AxiosResponse } from "axios";
 import { ResponseData, ResponseJsonData, StandardResponseData, SpecialResponseData } from "./response.data";
-export type EventHandler<T = any> = (data?: T) => void;
-export declare enum EventType {
-    Success = "success",
-    Error = "error",
-    hitCache = "hitCache",
-    Finish = "finish"
-}
-export type SnailMethodEventType = `${EventType}` | EventType | string;
 export type SendRequest<RD extends ResponseData = StandardResponseData<ResponseJsonData>> = () => Promise<RD extends SpecialResponseData ? AxiosResponse<RD> : RD>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@snail-js/api",
-  "version": "0.1.21",
+  "version": "0.1.22",
   "description": "Http Request with Decorators Api, build on axios",
   "type": "module",
   "main": "./src/index.ts",