ani-client 2.2.1 → 2.4.0

package/dist/index.mjs

@@ -1,3 +1,60 @@
+// src/utils/dataloader.ts
+var BatchLoader = class {
+  constructor(batchFetch, maxWaitMs = 50) {
+    this.batchFetch = batchFetch;
+    this.maxWaitMs = maxWaitMs;
+  }
+  queue = /* @__PURE__ */ new Map();
+  timeout = null;
+  /**
+   * Queue an ID to be fetched in the next batch.
+   * Returns a Promise that resolves when the batch request completes.
+   */
+  async load(id) {
+    return new Promise((resolve, reject) => {
+      let callbacks = this.queue.get(id);
+      if (!callbacks) {
+        callbacks = [];
+        this.queue.set(id, callbacks);
+      }
+      callbacks.push({ resolve, reject });
+      if (this.timeout === null) {
+        this.timeout = setTimeout(() => this.dispatch(), this.maxWaitMs);
+        if (typeof this.timeout.unref === "function") {
+          this.timeout.unref();
+        }
+      }
+    });
+  }
+  async dispatch() {
+    this.timeout = null;
+    if (this.queue.size === 0) return;
+    const currentQueue = this.queue;
+    this.queue = /* @__PURE__ */ new Map();
+    const ids = Array.from(currentQueue.keys());
+    try {
+      const results = await this.batchFetch(ids);
+      const resultMap = /* @__PURE__ */ new Map();
+      for (const item of results) {
+        resultMap.set(item.id, item);
+      }
+      for (const [id, callbacks] of currentQueue.entries()) {
+        const result = resultMap.get(id);
+        if (result) {
+          for (const cb of callbacks) cb.resolve(result);
+        } else {
+          const err = new Error(`Item with ID ${id} not found in batch response`);
+          for (const cb of callbacks) cb.reject(err);
+        }
+      }
+    } catch (err) {
+      for (const callbacks of currentQueue.values()) {
+        for (const cb of callbacks) cb.reject(err);
+      }
+    }
+  }
+};
+
 // src/utils/markdown.ts
 function isSafeUrl(url) {
   return /^https?:\/\//i.test(url);
@@ -115,8 +172,17 @@ function validateIds(ids, label = "id") {
 function sortObjectKeys(obj) {
   if (obj === null || typeof obj !== "object") return obj;
   if (Array.isArray(obj)) return obj.map(sortObjectKeys);
+  const keys = Object.keys(obj);
+  if (keys.length === 0) return obj;
+  if (keys.length === 1) {
+    const key = keys[0];
+    const val = obj[key];
+    const sortedVal = sortObjectKeys(val);
+    if (val === sortedVal) return obj;
+    return { [key]: sortedVal };
+  }
   const sorted = {};
-  for (const key of Object.keys(obj).sort()) {
+  for (const key of keys.sort()) {
     sorted[key] = sortObjectKeys(obj[key]);
   }
   return sorted;
@@ -130,10 +196,10 @@ var NormalizedCache = class {
   swrMs;
   queryStore = /* @__PURE__ */ new Map();
   entityStore = /* @__PURE__ */ new Map();
+  refCount = /* @__PURE__ */ new Map();
   _hits = 0;
   _misses = 0;
   _stales = 0;
-  gcTimeout;
   constructor(options = {}) {
     this.ttl = options.ttl ?? 24 * 60 * 60 * 1e3;
     this.maxSize = options.maxSize ?? 500;
@@ -145,11 +211,11 @@ var NormalizedCache = class {
     return `${normalized}|${JSON.stringify(sortObjectKeys(variables))}`;
   }
   /** Normalizes a GraphQL response, extracting entities and returning a tree of references. */
-  normalize(data, seen = /* @__PURE__ */ new WeakSet()) {
+  normalize(data, refsOut, seen = /* @__PURE__ */ new WeakSet()) {
     if (Array.isArray(data)) {
       if (seen.has(data)) return null;
       seen.add(data);
-      return data.map((item) => this.normalize(item, seen));
+      return data.map((item) => this.normalize(item, refsOut, seen));
     }
     if (data !== null && typeof data === "object") {
       if (seen.has(data)) return null;
@@ -157,17 +223,22 @@ var NormalizedCache = class {
       const obj = data;
       if (typeof obj.__typename === "string" && (typeof obj.id === "number" || typeof obj.id === "string")) {
         const ref = `${obj.__typename}:${obj.id}`;
+        refsOut.add(ref);
         const normalizedObj = {};
-        for (const [k, v] of Object.entries(obj)) {
-          normalizedObj[k] = this.normalize(v, seen);
+        for (const k in obj) {
+          if (Object.hasOwn(obj, k)) {
+            normalizedObj[k] = this.normalize(obj[k], refsOut, seen);
+          }
         }
         const existing = this.entityStore.get(ref) || {};
         this.entityStore.set(ref, { ...existing, ...normalizedObj });
         return { __ref: ref };
       }
       const result = {};
-      for (const [k, v] of Object.entries(obj)) {
-        result[k] = this.normalize(v, seen);
+      for (const k in obj) {
+        if (Object.hasOwn(obj, k)) {
+          result[k] = this.normalize(obj[k], refsOut, seen);
+        }
       }
       return result;
     }
@@ -193,10 +264,12 @@ var NormalizedCache = class {
         return result2;
       }
       const result = {};
-      for (const [k, v] of Object.entries(obj)) {
-        const denormalized = this.denormalize(v, seen);
-        if (denormalized === void 0) return void 0;
-        result[k] = denormalized;
+      for (const k in obj) {
+        if (Object.hasOwn(obj, k)) {
+          const denormalized = this.denormalize(obj[k], seen);
+          if (denormalized === void 0) return void 0;
+          result[k] = denormalized;
+        }
       }
       return result;
     }
@@ -215,14 +288,14 @@ var NormalizedCache = class {
       if (this.swrMs > 0 && now <= entry.expiresAt + this.swrMs) {
         isStale = true;
       } else {
-        this.queryStore.delete(key);
+        this.deleteQueryEntry(key, entry);
         this._misses++;
         return void 0;
       }
     }
     const denormalized = this.denormalize(entry.data);
     if (denormalized === void 0) {
-      this.queryStore.delete(key);
+      this.deleteQueryEntry(key, entry);
       this._misses++;
       return void 0;
     }
@@ -241,27 +314,46 @@ var NormalizedCache = class {
   }
   set(key, data) {
     if (!this.enabled) return;
-    const normalizedData = this.normalize(data);
-    this.queryStore.delete(key);
+    const refs = /* @__PURE__ */ new Set();
+    const normalizedData = this.normalize(data, refs);
+    const existing = this.queryStore.get(key);
+    if (existing) {
+      this.deleteQueryEntry(key, existing);
+    }
     if (this.maxSize > 0 && this.queryStore.size >= this.maxSize) {
       const firstKey = this.queryStore.keys().next().value;
       if (firstKey !== void 0) {
-        this.queryStore.delete(firstKey);
+        const firstEntry = this.queryStore.get(firstKey);
+        if (firstEntry) this.deleteQueryEntry(firstKey, firstEntry);
+      }
+    }
+    for (const ref of refs) {
+      this.refCount.set(ref, (this.refCount.get(ref) ?? 0) + 1);
+    }
+    this.queryStore.set(key, { data: normalizedData, refs, expiresAt: Date.now() + this.ttl });
+  }
+  deleteQueryEntry(key, entry) {
+    this.queryStore.delete(key);
+    for (const ref of entry.refs) {
+      const count = (this.refCount.get(ref) ?? 0) - 1;
+      if (count <= 0) {
+        this.refCount.delete(ref);
+        this.entityStore.delete(ref);
+      } else {
+        this.refCount.set(ref, count);
       }
-      this.scheduleGc();
     }
-    this.queryStore.set(key, { data: normalizedData, expiresAt: Date.now() + this.ttl });
   }
   delete(key) {
-    return this.queryStore.delete(key);
+    const entry = this.queryStore.get(key);
+    if (!entry) return false;
+    this.deleteQueryEntry(key, entry);
+    return true;
   }
   clear() {
-    if (this.gcTimeout) {
-      clearTimeout(this.gcTimeout);
-      this.gcTimeout = void 0;
-    }
     this.queryStore.clear();
     this.entityStore.clear();
+    this.refCount.clear();
     this._hits = 0;
     this._misses = 0;
     this._stales = 0;
@@ -278,7 +370,9 @@ var NormalizedCache = class {
     for (const key of this.queryStore.keys()) {
       if (test(key)) toDelete.push(key);
     }
-    for (const key of toDelete) this.queryStore.delete(key);
+    for (const key of toDelete) {
+      this.delete(key);
+    }
     return toDelete.length;
   }
   get stats() {
@@ -296,53 +390,6 @@ var NormalizedCache = class {
     this._misses = 0;
     this._stales = 0;
   }
-  scheduleGc() {
-    if (this.gcTimeout) return;
-    this.gcTimeout = setTimeout(() => {
-      this.gc();
-      this.gcTimeout = void 0;
-    }, 500);
-    if (typeof this.gcTimeout.unref === "function") {
-      this.gcTimeout.unref();
-    }
-  }
-  /**
-   * Garbage-collect orphaned entities that are no longer referenced by any query.
-   * Called automatically on LRU eviction to prevent unbounded entity store growth.
-   */
-  gc() {
-    const referencedRefs = /* @__PURE__ */ new Set();
-    const collectRefs = (data) => {
-      if (Array.isArray(data)) {
-        for (const item of data) collectRefs(item);
-        return;
-      }
-      if (data !== null && typeof data === "object") {
-        const obj = data;
-        if (typeof obj.__ref === "string") {
-          referencedRefs.add(obj.__ref);
-          const entity = this.entityStore.get(obj.__ref);
-          if (entity && !referencedRefs.has(`_visited:${obj.__ref}`)) {
-            referencedRefs.add(`_visited:${obj.__ref}`);
-            collectRefs(entity);
-          }
-          return;
-        }
-        for (const v of Object.values(obj)) collectRefs(v);
-      }
-    };
-    for (const entry of this.queryStore.values()) {
-      collectRefs(entry.data);
-    }
-    let removed = 0;
-    for (const ref of this.entityStore.keys()) {
-      if (!referencedRefs.has(ref)) {
-        this.entityStore.delete(ref);
-        removed++;
-      }
-    }
-    return removed;
-  }
 };
 
 // src/cache/index.ts
@@ -2539,7 +2586,7 @@ function mapFavorites(fav) {
 
 // src/client/index.ts
 var DEFAULT_API_URL = "https://graphql.anilist.co";
-var LIB_VERSION = "2.2.1" ;
+var LIB_VERSION = "2.4.0" ;
 var AniListClient = class {
   apiUrl;
   headers;
@@ -2551,6 +2598,9 @@ var AniListClient = class {
   inFlight = /* @__PURE__ */ new Map();
   _rateLimitInfo;
   _lastRequestMeta;
+  mediaLoader;
+  characterLoader;
+  staffLoader;
   constructor(options = {}) {
     this.apiUrl = options.apiUrl ?? DEFAULT_API_URL;
     this.headers = {
@@ -2566,6 +2616,9 @@ var AniListClient = class {
     this.hooks = options.hooks ?? {};
     this.logger = options.logger;
     this.signal = options.signal;
+    this.mediaLoader = new BatchLoader((ids) => this.getMediaBatch(ids), 50);
+    this.characterLoader = new BatchLoader((ids) => this.getCharacterBatch(ids), 50);
+    this.staffLoader = new BatchLoader((ids) => this.getStaffBatch(ids), 50);
   }
   /**
    * The current rate limit information from the last API response.
@@ -2696,6 +2749,9 @@ var AniListClient = class {
    * @param include - Optional related data to include
    */
   async getMedia(id, include) {
+    if (!include) {
+      return this.mediaLoader.load(id);
+    }
     return getMedia(this, id, include);
   }
   async getMediaCharacters(mediaId, options = {}) {
@@ -2764,6 +2820,9 @@ var AniListClient = class {
   }
   /** Fetch a character by AniList ID. Pass `{ voiceActors: true }` to include VA data. */
   async getCharacter(id, include) {
+    if (!include) {
+      return this.characterLoader.load(id);
+    }
     return getCharacter(this, id, include);
   }
   /** Search for characters by name. */
@@ -2772,6 +2831,9 @@ var AniListClient = class {
   }
   /** Fetch a staff member by AniList ID. Pass `{ media: true }` or `{ media: { perPage } }` for media credits. */
   async getStaff(id, include) {
+    if (!include) {
+      return this.staffLoader.load(id);
+    }
     return getStaff(this, id, include);
   }
   /** Search for staff (voice actors, directors, etc.). */
@@ -2891,7 +2953,7 @@ var AniListClient = class {
     if (ids.length === 0) return [];
     validateIds(ids, "mediaId");
     const [singleMediaId] = ids;
-    if (ids.length === 1 && singleMediaId !== void 0) return [await this.getMedia(singleMediaId)];
+    if (ids.length === 1 && singleMediaId !== void 0) return [await getMedia(this, singleMediaId)];
     return this.executeBatch(ids, buildBatchMediaQuery, "m");
   }
   /** Fetch multiple characters in a single API request. */
@@ -2899,7 +2961,8 @@ var AniListClient = class {
     if (ids.length === 0) return [];
     validateIds(ids, "characterId");
     const [singleCharId] = ids;
-    if (ids.length === 1 && singleCharId !== void 0) return [await this.getCharacter(singleCharId)];
+    if (ids.length === 1 && singleCharId !== void 0)
+      return [await getCharacter(this, singleCharId)];
     return this.executeBatch(ids, buildBatchCharacterQuery, "c");
   }
   /** Fetch multiple staff members in a single API request. */
@@ -2907,7 +2970,7 @@ var AniListClient = class {
     if (ids.length === 0) return [];
     validateIds(ids, "staffId");
     const [singleStaffId] = ids;
-    if (ids.length === 1 && singleStaffId !== void 0) return [await this.getStaff(singleStaffId)];
+    if (ids.length === 1 && singleStaffId !== void 0) return [await getStaff(this, singleStaffId)];
     return this.executeBatch(ids, buildBatchStaffQuery, "s");
   }
   /** @internal */