eve-esi-types 2.3.0 → 2.3.2

package/esi-types-util.md

@@ -28,7 +28,11 @@ type TESIRequestFunctionSignature<ActualOpt> = <
 `IfParameterizedPath<EP, Opt>` if parameterized path then specify number type, otherwise will be `Opt` type.
 
 ```ts
-type IfParameterizedPath<EP, Opt> = EP extends `${string}/{${string}}/${string | ""}` ? number | number[]: Opt;
+type IfParameterizedPath<EP, Opt> = EP extends `${string}/{${string}}${string}`
+  ? PickPathParameters<EP> extends never
+    ? Opt : InferKeysLen<PickPathParameters<EP>> extends 1
+        ? number : [number, number]
+    : Opt;
 ```
 
 ### IdentifyParameters

package/lib/esi-error-types.d.ts

@@ -0,0 +1,104 @@
+
+type TEVEErrorBase = {
+  /**
+   * error message
+   */
+  error: string;
+};
+/**
+ * There are endpoints with status 200 only that contain the "X-Pages" header.
+ */
+export type TSuccessStats = 200 | 201 | 204;
+export type TRedirectStats = 304;
+export type TClientErrorStats = 400 | 401 | 403 | 404 | 420 | 422;
+export type TServerErrorStats = 500 | 503 | 504 | 520;
+export type TESIErrorStats = TClientErrorStats | TServerErrorStats;
+export type TStatsAll = TSuccessStats | TRedirectStats | TClientErrorStats | TServerErrorStats;
+export type TESIErrorStatMap = {
+  // status 400
+  400: BadRequest;
+  401: Unauthorized;
+  403: Forbidden;
+  404: NotFound;
+  420: ErrorLimited;
+  422: Unprocessable;
+
+  // status 500
+  500: InternalServerError;
+  503: ServiceUnavailable;
+  504: GatewayTimeout;
+  520: EVEServerError;
+};
+/**
+ * ```ts
+ * const res = await fetch("<URL with ESI endpoint>");
+ * const status = res.status;
+ * if (status >= 400) {
+ *   const errorType: TESIErrorWithStat<typeof status> = {
+ *     status, ...res.json() 
+ *   };
+ *   console.log(errorType);
+ *   throw new Error(`message="${res.statusText}", status=${status}`);
+ * }
+ * ```
+ * 
+ * @date 2025/3/3
+ * @since 2.4.0
+ */
+export type TESIErrorWithStat<Stat extends TClientErrorStats | TServerErrorStats> = {
+  status: Stat;
+} & TESIErrorStatMap[Stat];
+// declare const bad: TESIErrorWithStat<400>;
+
+/**
+ * Bad request model 400
+ */
+export interface BadRequest extends TEVEErrorBase {}
+/**
+ * Not Found model 404
+ */
+export interface NotFound extends TEVEErrorBase {}
+/**
+ * Unprocessable model 422[Unprocessable entity]
+ */
+export interface Unprocessable extends TEVEErrorBase {}
+/**
+ * Unauthorized model 401
+ */
+export interface Unauthorized extends TEVEErrorBase {}
+/**
+ * Forbidden model 403
+ */
+export interface Forbidden extends TEVEErrorBase {
+  /**
+   * status code received from SSO
+   */
+  sso_status?: number;
+}
+
+/**
+ * Error limited model 420
+ */
+export interface ErrorLimited extends TEVEErrorBase {}
+
+/**
+ * Internal server error model 500
+ */
+export interface InternalServerError extends TEVEErrorBase {}
+/**
+ * Service unavailable model 503
+ */
+export interface ServiceUnavailable extends TEVEErrorBase {}
+/**
+ * Gateway timeout model 504
+ */
+export interface GatewayTimeout extends TEVEErrorBase {
+  /**
+   * number of seconds the request was given
+   */
+  timeout?: number;
+}
+/**
+ * EVE server error model 520
+ */
+export interface EVEServerError extends InternalServerError {}

package/lib/request-api.mjs

@@ -55,12 +55,15 @@ export const request = async (method, endpoint, pathParams, opt) => {
     const url = `${endpointUrl}${up.size ? `?${up}` : ""}`;
     DEBUG && log(url);
     try {
-        return await fetch(url, rqopt).then(res => {
-            if (res.status >= 400) {
-                throw new util.ESIRequesError(`${res.statusText} (status=${res.status})`);
-            }
-            return res.json();
-        });
+        const res = await fetch(url, rqopt);
+        const { status } = res;
+        // The parameters are different for successful and error responses.
+        if (util.isSuccess(status)) {
+            return util.handleSuccessResponse(res, endpointUrl, rqopt, up);
+        }
+        // else if (isError(status)) {}
+        // Actually, throw Error
+        throw await util.handleESIError(res, endpointUrl, actualOpt.cancelable);
     }
     catch (e) {
         log(e);

package/lib/rq-util.d.mts

@@ -7,6 +7,7 @@
 */
 import "colors.ts";
 import type { TESIRequestFunctionMethods } from "../v2";
+import type { TESIErrorStats } from "./esi-error-types";
 /**
  * this always `https://esi.evetech.net`
  */
@@ -25,10 +26,6 @@ export type ESIRequestOptions = {
      * will need it for `POST` request etc.
      */
     body?: any;
-    /**
-     * if want response data with ignore error then can be set to `true`.
-     */
-    ignoreError?: boolean;
     /**
      * cancel request immediately
      */
@@ -46,6 +43,9 @@ export type ESIRequestOptions = {
      */
     auth?: true;
 };
+/**
+ * @typedef {string | number | boolean} Truthy
+ */
 /**
  * simple named error class.
  */
@@ -61,12 +61,58 @@ export declare class ESIErrorLimitReachedError extends ESIRequesError {
 /**
  * @typedef {import("./rq-util.mjs").ESIRequestOptions} ESIRequestOptions
  */
+/**
+ * #### status: 200 | 201 | 204
+ *
+ *  + Returns a json object only if the status is `200` or `201`.
+ *
+ * @param {Response} response
+ * @param {string} endpointUrl
+ * @param {RequestInit} requestOpt
+ * @param {URLSearchParams} urlParams
+ * @param {(minus?: Truthy) => void=} increment
+ * @returns {Promise<any>}
+ */
+export declare const handleSuccessResponse: (response: Response, endpointUrl: string, requestOpt: RequestInit, urlParams: URLSearchParams, increment?: (minus?: Truthy) => void) => Promise<any>;
+/**
+ * @import {
+ *     TESIErrorStats,
+ *     TESIErrorStatMap,
+ *     TESIErrorWithStat
+ * } from "./esi-error-types";
+ */
+/**
+ * #### status: (400 | 401 | 403 | 404 | 420 | 422) or (500 | 503 | 504 | 520)
+ *
+ * @param {Response} res
+ * @param {string} endpointUrl
+ * @param {AbortController} abortable
+ * @returns {Promise<void>}
+ */
+export declare const handleESIError: (res: Response, endpointUrl: string, abortable?: AbortController) => Promise<void>;
+/**
+ * @param {number} stat
+ * @returns {stat is 200 | 201 | 204}
+ */
+export declare const isSuccess: (stat: number) => stat is 200 | 201 | 204;
+/**
+ * @param {number} stat
+ * @returns {stat is TESIErrorStats}
+ */
+export declare const isError: (stat: number) => stat is TESIErrorStats;
+/**
+ * @returns {boolean}
+ */
 export declare const isDebug: () => boolean;
+/**
+ * @param {string} opt
+ * @returns {boolean}
+ */
 export declare const is: (opt: string) => boolean;
 /**
  * @param {string} method
  * @param {ESIRequestOptions} opt
- * @returns
+ * @returns {{ rqopt: RequestInit, qss: Record<string, string> }}
  */
 export declare const initOptions: (method: string, opt: ESIRequestOptions) => {
     rqopt: RequestInit;
@@ -76,12 +122,13 @@ export declare const initOptions: (method: string, opt: ESIRequestOptions) => {
  * fetch the extra pages
  *
  *   + if the `x-pages` header property ware more than 1
- *
+ * @template {any} T
  * @param {string} endpointUrl
  * @param {RequestInit} rqopt request options
  * @param {URLSearchParams} rqp queries
  * @param {number} pc pageCount
  * @param {(minus?: number) => void=} increment
+ * @returns {Promise<T | null>}
  */
 export declare const fetchP: <T extends unknown>(endpointUrl: string, rqopt: RequestInit, rqp: URLSearchParams, pc: number, increment?: (minus?: Truthy) => void) => Promise<T | null>;
 /** ### replace (C)urly (B)races (T)oken
@@ -93,13 +140,14 @@ export declare const fetchP: <T extends unknown>(endpointUrl: string, rqopt: Req
  *
  * @param {string} endpoint e.g - "/characters/{character_id}/"
  * @param {number[]} ids
- * @returns fragment of qualified endpoint uri or null.
+ * @returns {string | null} fragment of qualified endpoint uri or null.
  */
 export declare const replaceCbt: (endpoint: string, ids: number[]) => string;
 /**
  *
  * @param {string} endp this means endpoint url fragment like `/characters/{character_id}/` or `/characters/{character_id}/agents_research/`
  *   + The version parameter is forced to apply `latest`
+ * @returns {string}
  */
 export declare const curl: (endp: string) => string;
 /**
@@ -116,5 +164,6 @@ export declare function getLogger(): {
  * #### Fire a request that does not require authentication.
  *
  * @param {TESIRequestFunctionSignature<ESIRequestOptions> | TESIRequestFunctionMethods} fn
+ * @returns {Promise<void>}
  */
 export declare function fireRequestsDoesNotRequireAuth(fn: TESIRequestFunctionSignature<ESIRequestOptions> | TESIRequestFunctionMethods<ESIRequestOptions>): Promise<void>;

package/lib/rq-util.mjs

@@ -24,6 +24,9 @@ let LOG = false;
  * this always `https://esi.evetech.net`
  */
 export const BASE = "https://esi.evetech.net";
+/**
+ * @typedef {string | number | boolean} Truthy
+ */
 /**
  * simple named error class.
  */
@@ -46,14 +49,121 @@ export class ESIErrorLimitReachedError extends ESIRequesError {
 // - - - - - - - - - - - - - - - - - - - -
 //            utility functions
 // - - - - - - - - - - - - - - - - - - - -
+/**
+ * #### status: 200 | 201 | 204
+ *
+ *  + Returns a json object only if the status is `200` or `201`.
+ *
+ * @param {Response} response
+ * @param {string} endpointUrl
+ * @param {RequestInit} requestOpt
+ * @param {URLSearchParams} urlParams
+ * @param {(minus?: Truthy) => void=} increment
+ * @returns {Promise<any>}
+ */
+export const handleSuccessResponse = async (response, endpointUrl, requestOpt, urlParams, increment = () => { }) => {
+    // NoContentResponse
+    if (response.status === 204)
+        return {};
+    /** @type {any} */
+    const data = await response.json();
+    // - - - - x-pages response.
+    // +undefined is NaN
+    // @ts-expect-error becouse +null is 0
+    const pc = +response.headers.get("x-pages");
+    // has remaining pages? NaN > 1 === false !isNaN(pageCount)
+    if (pc > 1) {
+        LOG && log('found "x-pages" header, pages: %d', pc);
+        const remData = await fetchP(endpointUrl, requestOpt, urlParams, pc, increment);
+        // finally, decide product data.
+        if (isArray(data) && isArray(remData)) {
+            // DEVNOTE: 2019/7/23 15:01:48 - types
+            return data.concat(remData);
+        }
+        else {
+            remData && Object.assign(data, remData);
+        }
+    }
+    return data;
+};
+/**
+ * @import {
+ *     TESIErrorStats,
+ *     TESIErrorStatMap,
+ *     TESIErrorWithStat
+ * } from "./esi-error-types";
+ */
+/**
+ * #### status: (400 | 401 | 403 | 404 | 420 | 422) or (500 | 503 | 504 | 520)
+ *
+ * @param {Response} res
+ * @param {string} endpointUrl
+ * @param {AbortController} abortable
+ * @returns {Promise<void>}
+ */
+export const handleESIError = async (res, endpointUrl, abortable) => {
+    const status = /** @type {TESIErrorStats} */ (res.status);
+    /** @type {TESIErrorStatMap[typeof status]} */
+    const esiError = await res.json();
+    /** @type {TESIErrorWithStat<typeof status>} */
+    const errorType = {
+        status, ...esiError
+    };
+    // log ESI Error details
+    console.warn(errorType);
+    if (status === 420) {
+        abortable && abortable.abort();
+        throw new ESIErrorLimitReachedError();
+    }
+    else {
+        // console.log(res);
+        throw new ESIRequesError(`${res.statusText} (status=${status}, url=${endpointUrl})`);
+    }
+};
+/** @satisfies {TESIErrorStats[]} */
+const ESIErrorStats = [
+    // status 400
+    400, // BadRequest;
+    401, // Unauthorized;
+    403, // Forbidden;
+    404, // NotFound;
+    420, // ErrorLimited;
+    422, // Unprocessable;
+    // status 500
+    500, // InternalServerError;
+    503, // ServiceUnavailable;
+    504, // GatewayTimeout;
+    520, // EVEServerError;
+];
+/**
+ * @param {number} stat
+ * @returns {stat is 200 | 201 | 204}
+ */
+export const isSuccess = (stat) => {
+    return stat === 200 || stat === 201 || stat === 204;
+};
+/**
+ * @param {number} stat
+ * @returns {stat is TESIErrorStats}
+ */
+export const isError = (stat) => {
+    return ESIErrorStats.includes(/** @type {TESIErrorStats} */ (stat));
+};
+/**
+ * @returns {boolean}
+ */
 export const isDebug = () => {
     return process.argv.includes("-debug");
 };
+/**
+ * @param {string} opt
+ * @returns {boolean}
+ */
 export const is = (opt) => process.argv.includes(`-${opt}`);
 /**
  * @param {string} method
  * @param {ESIRequestOptions} opt
- * @returns
+ * @returns {{ rqopt: RequestInit, qss: Record<string, string> }}
  */
 export const initOptions = (method, opt) => {
     /** @type {RequestInit} */
@@ -64,6 +174,7 @@ export const initOptions = (method, opt) => {
         signal: opt.cancelable?.signal,
         headers: {}
     };
+    /** @type {Record<string, string>} */
     const qss = {
     // language: "en",
     };
@@ -87,12 +198,13 @@ export const initOptions = (method, opt) => {
  * fetch the extra pages
  *
  *   + if the `x-pages` header property ware more than 1
- *
+ * @template {any} T
  * @param {string} endpointUrl
  * @param {RequestInit} rqopt request options
  * @param {URLSearchParams} rqp queries
  * @param {number} pc pageCount
  * @param {(minus?: number) => void=} increment
+ * @returns {Promise<T | null>}
  */
 export const fetchP = async (endpointUrl, rqopt, rqp, pc, increment = () => { }) => {
     const rqs = [];
@@ -113,7 +225,7 @@ export const fetchP = async (endpointUrl, rqopt, rqp, pc, increment = () => { })
             for (let i = 0, end = jsons.length; i < end;) {
                 combined = combined.concat(jsons[i++]);
             }
-            return combined;
+            return /** @type {T} */ (combined);
         }
         LOG && log("> > > pages result are object < < < --", jsons);
         return null;
@@ -128,22 +240,17 @@ export const fetchP = async (endpointUrl, rqopt, rqp, pc, increment = () => { })
  *
  * @param {string} endpoint e.g - "/characters/{character_id}/"
  * @param {number[]} ids
- * @returns fragment of qualified endpoint uri or null.
+ * @returns {string | null} fragment of qualified endpoint uri or null.
  */
 export const replaceCbt = (endpoint, ids) => {
-    const re = /{([\w]+)}/g;
-    /** @type {RegExpExecArray?} */
-    let m;
     let idx = 0;
-    while (m = re.exec(endpoint)) {
-        endpoint = endpoint.replace(m[0], ids[idx++] + "");
-    }
-    return endpoint;
+    return endpoint.replace(/{([\w]+)}/g, $0 => ids[idx++] + "");
 };
 /**
  *
  * @param {string} endp this means endpoint url fragment like `/characters/{character_id}/` or `/characters/{character_id}/agents_research/`
  *   + The version parameter is forced to apply `latest`
+ * @returns {string}
  */
 export const curl = (endp) => {
     endp = endp.replace(/^\/+|\/+$/g, "");
@@ -160,7 +267,7 @@ export async function getSDEVersion() {
         const res = await fetch(sdeZipUrl, { method: "head", mode: "cors" });
         const date = res.headers.get("last-modified");
         if (date) {
-            const YMD = new Date(date).toLocaleDateString('en-CA').replace(/-/g, '');
+            const YMD = new Date(date).toLocaleDateString("en-CA").replace(/-/g, "");
             return `sde-${YMD}-TRANQUILITY`;
         }
         else {
@@ -175,7 +282,7 @@ export async function getSDEVersion() {
 }
 export function getLogger() {
     const clog = console.log.bind(console, '- - -> Get the character data of "CCP Zoetrope"'.magenta);
-    const rlog = console.log.bind(console, '- - -> Run ESI request'.cyan);
+    const rlog = console.log.bind(console, "- - -> Run ESI request".cyan);
     return { clog, rlog };
 }
 /**
@@ -212,6 +319,7 @@ function fireWithoutAuth(fn, method, endpoint, pathParams, opt) {
  * #### Fire a request that does not require authentication.
  *
  * @param {TESIRequestFunctionSignature<ESIRequestOptions> | TESIRequestFunctionMethods} fn
+ * @returns {Promise<void>}
  */
 export async function fireRequestsDoesNotRequireAuth(fn) {
     const { clog, rlog } = getLogger();
@@ -278,6 +386,7 @@ export async function fireRequestsDoesNotRequireAuth(fn) {
             },
         });
         // TODO: want TypeScript semantics to throw an error because there is a required query parameter, but it's not possible
+        //   Or rather, I don't know how to do it.
         await fireWithoutAuth(fn, "get", "/characters/{character_id}/search/");
         log(ok);
     }

package/lib/tagged-request-api.d.mts

@@ -6,6 +6,7 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /// <reference types="../v2/esi-tagged-types"/>
+import type { ESIRequestOptions } from "./rq-util.mjs";
 /**
  * `esi-tagged-types` and `injectESIRequestBody` allow for more intuitive use of ESI requests based on the "tags" defined in the EVE Swagger JSON.
  *
@@ -17,13 +18,18 @@
  *    const esiRequest = taggedApi.injectESIRequestBody(...);
  *    const ret = await esiRequest.universe.get("/universe/structures/", { query: { filter: "market" }});
  *
+ * @template {Record<string, unknown>} Opt
  * @param {TESIRequestFunctionSignature<{}>} requestBody
  * @returns {XESI.TaggedESIRequestMap}
  * @since 2.3
  */
-export declare function injectESIRequestBody(requestBody: TESIRequestFunctionSignature<{}>): XESI.TaggedESIRequestMap;
+export declare function injectESIRequestBody<Opt extends Record<string, unknown>>(requestBody: TESIRequestFunctionSignature<Opt>): XESI.TaggedESIRequestMap<Opt>;
+/**
+ * @import { ESIRequestOptions } from "./rq-util.mjs";
+ */
 /**
  * Injects the minimal implementation of ESI requests into `XESI.TaggedESIRequestMap`.
  * @since 2.3
+ * @type {XESI.TaggedESIRequestMap<ESIRequestOptions>}
  */
-export declare const esi: XESI.TaggedESIRequestMap;
+export declare const esi: import("../v2/esi-tagged-types").TaggedESIRequestMap<ESIRequestOptions>;

package/lib/tagged-request-api.mjs

@@ -10,27 +10,28 @@
  * @file eve-esi-types/lib/tagged-request-api.mts
  */
 import { request } from "./request-api.mjs";
-/** @satisfies {XESI.ESITags[]} */
-const ESI_TAGs = [
-    "Alliance", "Assets",
-    "Calendar", "Character",
-    "Clones", "Contacts",
-    "Contracts", "Corporation",
-    "Dogma", "Faction Warfare",
-    "Fittings", "Fleets",
-    "Incursions", "Industry",
-    "Insurance", "Killmails",
-    "Location", "Loyalty",
-    "Mail", "Market",
-    "Opportunities", "Planetary Interaction",
-    "Routes", "Search",
-    "Skills", "Sovereignty",
-    "Status", "Universe",
-    "User Interface", "Wallet",
-    "Wars"
+/**
+ * @typedef {`${string}${"" | `,${string}`}`} TMethodList
+ */
+/** @satisfies {`${XESI.ESITags}:${TMethodList}`[]} */
+const ESITagsWithMethodList = [
+    "Alliance:get", "Assets:get,post",
+    "Calendar:get,put", "Character:get,post",
+    "Clones:get", "Contacts:get,post,put,delete",
+    "Contracts:get", "Corporation:get",
+    "Dogma:get", "Faction Warfare:get",
+    "Fittings:get,post,delete", "Fleets:get,post,put,delete",
+    "Incursions:get", "Industry:get",
+    "Insurance:get", "Killmails:get",
+    "Location:get", "Loyalty:get",
+    "Mail:get,post,put,delete", "Market:get",
+    "Opportunities:get", "Planetary Interaction:get",
+    "Routes:get", "Search:get",
+    "Skills:get", "Sovereignty:get",
+    "Status:get", "Universe:get,post",
+    "User Interface:post", "Wallet:get",
+    "Wars:get"
 ];
-/** @satisfies {TESIEntryMethod[]} */
-const METHODs = ["get", "post", "put", "delete"];
 /**
  * `esi-tagged-types` and `injectESIRequestBody` allow for more intuitive use of ESI requests based on the "tags" defined in the EVE Swagger JSON.
  *
@@ -42,28 +43,32 @@ const METHODs = ["get", "post", "put", "delete"];
  *    const esiRequest = taggedApi.injectESIRequestBody(...);
  *    const ret = await esiRequest.universe.get("/universe/structures/", { query: { filter: "market" }});
  *
+ * @template {Record<string, unknown>} Opt
  * @param {TESIRequestFunctionSignature<{}>} requestBody
  * @returns {XESI.TaggedESIRequestMap}
  * @since 2.3
  */
-// Here, functions are implemented for "get", "post", "put", and "delete" for convenience.
-// However, in the completion listed by `injectESIRequestBody(<requestBody>).`, only the inferred methods will be listed.
 export function injectESIRequestBody(requestBody) {
-    const rq = /** @type {XESI.TaggedESIRequestMap} */ ({});
-    for (const tag of ESI_TAGs) {
-        const camel = 
-        /** @type {XESI.LCamelCase<XESI.ESITags>} */ (tag[0].toLowerCase() + tag.slice(1).replace(/\s(\w)/g, "$1"));
-        const entry = /** @type {XESI.ESITaggedEndpointRequest<typeof tag>} */ ({});
-        for (const method of METHODs) {
-            // @ts-ignore ignore ts(2590)
+    const rq = /** @type {XESI.TaggedESIRequestMap<Opt>} */ ({});
+    for (const tagEntry of ESITagsWithMethodList) {
+        const [tag, methodList] = /** @type {[tag: XESI.ESITags, methods: TMethodList]} */ (tagEntry.split(":"));
+        const methods = /** @type {TESIEntryMethod[]} */ (methodList.split(","));
+        const entry = /** @type {XESI.ESITaggedEndpointRequest<typeof tag, Opt>} */ ({});
+        for (const method of methods) {
+            // @ts-expect-error
             entry[method] = /** @satisfies {XESI.TaggedEndpointRequestFunction<typeof method, typeof tag>} */ ((e, params, opt) => requestBody(method, e, params, opt));
         }
-        rq[camel] = entry;
+        const camelCased = /** @type {XESI.LCamelCase<XESI.ESITags>} */ (tag[0].toLowerCase() + tag.slice(1).replace(/\s(.)/g, "$1"));
+        rq[camelCased] = entry;
     }
     return rq;
 }
+/**
+ * @import { ESIRequestOptions } from "./rq-util.mjs";
+ */
 /**
  * Injects the minimal implementation of ESI requests into `XESI.TaggedESIRequestMap`.
  * @since 2.3
+ * @type {XESI.TaggedESIRequestMap<ESIRequestOptions>}
  */
 export const esi = injectESIRequestBody(request);

package/minimal-rq.mjs

@@ -27,11 +27,10 @@ const log = console.log;
 // Delegates implementation to `request` (TESIRequestFunctionMethods)
 //
 const esiMethods = /** @type {TESIRequestFunctionMethods} */ ({});
-["get", "post", "put", "delete"].forEach((method) => {
-    esiMethods[method] = function (endpoint, params, opt) {
-        // @ts-ignore
+/** @type {TESIEntryMethod[]} */ (["get", "post", "put", "delete"]).forEach((method) => {
+    esiMethods[method] = /** @type {TESIRequestFunctionEachMethod<typeof method>} */ (function (endpoint, params, opt) {
         return request(method, endpoint, params, opt);
-    };
+    });
 });
 // It should complete correctly.
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-esi-types",
-  "version": "2.3.0",
+  "version": "2.3.2",
   "description": "Extracted the main type of ESI. use for ESI request response types (version 2 only)",
   "main": "v2/index.d.ts",
   "scripts": {

package/tagged-rq.mjs

@@ -17,6 +17,7 @@ esiRq.universe.get("/universe/structures/", { query: { filter: "market" } }).the
 esiRq.universe.post("/universe/ids/", {
     body: ["the forge", "plex"]
 }).then(console.log);
+esiRq.fittings.delete("/characters/{character_id}/fittings/{fitting_id}/", [1234, 56789]);
 esiRq.assets.get("/characters/{character_id}/assets/", 1234, {
     auth: true
 }).then(console.log).catch(console.log);

package/tsconfig.json

@@ -18,6 +18,7 @@
   },
   "include": [
     "./scripts/**/*.mts",
+    "./scripts/**/*.d.ts",
     "./v2/*.d.ts"
   ],
   "exclude": [

package/v2/esi-tagged-types.d.ts

@@ -9,7 +9,7 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/esi-tagged-types.d.ts
- * @summary This file is auto-generated and defines version 2.3.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 2.3.2 of the EVE Online ESI response types.
  */
 import { TESIResponseOKMap } from "./index.d.ts";
 export * from "./index.d.ts";
@@ -29,6 +29,19 @@ export * from "./index.d.ts";
 export declare type LCamelCase<S extends string> = S extends `${infer P1} ${infer P2}`
   ? `${Lowercase<P1>}${Capitalize<P2>}` : Lowercase<S>;
 
+
+declare const enum EInferSomethingBy {
+  METHOD,
+  TAGs
+}
+declare type InferSomethingBy<Tag, AsType extends EInferSomethingBy = EInferSomethingBy.METHOD> = {
+  [M in TESIEntryMethod]: TESIResponseOKMap[M] extends Record<`/${string}/`, { tag: infer ActualTag }>
+    ? AsType extends EInferSomethingBy.TAGs
+      ? ActualTag : ActualTag extends Tag
+        ? M
+      : never
+    : never;
+}[TESIEntryMethod];
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
 //               Utility Type `ESITags`
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -37,10 +50,7 @@ export declare type LCamelCase<S extends string> = S extends `${infer P1} ${infe
  * @template M - The HTTP method.
  * @date 2025/2/28
  */
-export declare type ESITags = {
-  [M in TESIEntryMethod]: TESIResponseOKMap[M] extends Record<`/${string}/`, { tag: infer Tag }>
-    ? Tag : never
-}[TESIEntryMethod];
+export declare type ESITags = InferSomethingBy<never, EInferSomethingBy.TAGs>
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
 //            Utility Type `InferMethod`
@@ -51,12 +61,7 @@ export declare type ESITags = {
  * @template Tag - The tag to infer the method for.
  * @date 2025/2/28
  */
-export declare type InferMethod<Tag> = {
-  [M in TESIEntryMethod]: TESIResponseOKMap[M] extends Record<`/${string}/`, { tag: infer ActualTag }>
-    ? ActualTag extends Tag
-      ? M : never
-    : never;
-}[TESIEntryMethod];
+export declare type InferMethod<Tag> = InferSomethingBy<Tag>
 // type XAssets = InferMethod<"Assets">;
 // type XContacts = InferMethod<"Contacts">;
 // type XPlanetary = InferMethod<"Planetary Interaction">;
@@ -97,9 +102,9 @@ export declare type TaggedEndpointRequestFunction<M extends TESIEntryMethod, Tag
  * @template Tag - The tag to map.
  * @date 2025/2/28
  */
-export declare type ESITaggedEndpointRequest<Tag extends ESITags> = {
+export declare type ESITaggedEndpointRequest<Tag extends ESITags, ActualOpt = {}> = {
   [tag in Tag]: {
-    [method in InferMethod<Tag>]: TaggedEndpointRequestFunction<method, tag>;
+    [method in InferMethod<Tag>]: TaggedEndpointRequestFunction<method, tag, ActualOpt>;
   };
 }[Tag];
 
@@ -129,8 +134,8 @@ export declare type SelectEndpointByTag<
  * Maps lower camel case tags to their corresponding endpoint request functions.
  * @date 2025/2/28
  */
-export declare type TaggedESIRequestMap = {
-  [tag in ESITags as LCamelCase<tag>]: ESITaggedEndpointRequest<tag>;
+export declare type TaggedESIRequestMap<ActualOpt = {}> = {
+  [tag in ESITags as LCamelCase<tag>]: ESITaggedEndpointRequest<tag, ActualOpt>;
 };
 
 /**

package/v2/index.d.ts

@@ -9,12 +9,14 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/index.d.ts
- * @summary This file is auto-generated and defines version 2.3.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 2.3.2 of the EVE Online ESI response types.
  */
 
 import type { TESIResponseOKMap } from "./response-map.d.ts";
 export type { TESIResponseOKMap } from "./response-map.d.ts";
 
+import type { PickPathParameters, InferKeysLen } from "./util.d.ts";
+
 /**
  * Represents a function that can make ESI requests with various HTTP methods.
  *
@@ -73,6 +75,20 @@ declare global {
    */
   type RequireThese<T, K extends keyof T> = T & Required<Pick<T, K>>;
 
+  /**
+   * If `EP` (endpoint) is a parameterized path, determines the required number of replacements.
+   * 
+   * @template EP The string representing the endpoint path.
+   * @template Opt The type to return if `EP` is not parameterized.
+   * @returns {number | [number, number] | Opt} 
+   * Returns `number` if there is one parameter, `[number, number]` if there are two parameters, otherwise `Opt`.
+   */
+  type IfParameterizedPath<EP, Opt> = EP extends `${string}/{${string}}${string}`
+    ? PickPathParameters<EP> extends never
+      ? Opt : InferKeysLen<PickPathParameters<EP>> extends 1
+          ? number : [number, number]
+      : Opt;
+
   /**
    * ### ESI request function all in one signature
    * 
@@ -117,15 +133,6 @@ declare global {
     R extends InferESIResponseResult<M, EP>
   >(endpoint: EP, pathParams?: P2, options?: Opt) => Promise<R>;
 
-  // /**
-  //  * is parameterized path
-  //  */
-  // type IsParameterizedPath<EP, A, B> = EP extends `${string}/{${string}}/${string | ""}` ? A: B;
-  /**
-   * if parameterized path then specify number type, otherwise will be `Opt` type.
-   */
-  type IfParameterizedPath<EP, Opt> = EP extends `${string}/{${string}}/${string | ""}` ? number | number[]: Opt;
-
   /**
    * Identifies the required parameters for a given entry type.
    *
@@ -158,9 +165,8 @@ declare global {
 
   /**
    * Represents a response with no content (HTTP status 204).
-   * Although no data is returned, it indicates successful completion by returning a status of 204.
    */
-  type NoContentResponse = { status: 204 };
+  type NoContentResponse = { /* status: 204 */ };
 
   /**
    * Represents the HTTP methods supported by ESI.

package/v2/response-map.d.ts

@@ -9,7 +9,7 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/response-map.d.ts
- * @summary This file is auto-generated and defines version 2.3.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 2.3.2 of the EVE Online ESI response types.
  */
 import "./types-index.d.ts";
 

package/v2/types-index.d.ts

@@ -9,7 +9,7 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/types-index.d.ts
- * @summary This file is auto-generated and defines version 2.3.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 2.3.2 of the EVE Online ESI response types.
  */
 import "./get_wars_ok.d.ts";
 import "./get_status_ok.d.ts";

package/v2/util.d.ts

@@ -0,0 +1,51 @@
+/*!
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+//  Copyright (C) 2025 jeffy-g <hirotom1107@gmail.com>
+//  Released under the MIT license
+//  https://opensource.org/licenses/mit-license.php
+// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+*/
+/**
+ * @file eve-esi-types/v2/util.d.ts
+ * @since 2.3.1
+ */
+
+/**
+ * If `Path` is parameterized, return the parameter name, such as `killmail_id`.
+ * 
+ * @template Path The string representing the endpoint path.
+ * @returns {string | never} The parameter name if the path is parameterized, otherwise `never`.
+ */
+export type PickPathParameters<Path extends string> =
+  Path extends `${string}/{${infer Param}}/${infer Rest}`
+  ? Param | PickPathParameters<`/${Rest}`>
+  : never;
+
+/**
+ * Convert a union type to an intersection type.
+ * 
+ * @template U The union type to convert.
+ * @returns {I} The intersection type.
+ */
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+
+/**
+ * Convert a union type to a tuple.
+ * 
+ * @template T The union type to convert.
+ * @returns {Array} The tuple representation of the union type.
+ */
+type UnionToTuple<T> = UnionToIntersection<
+  T extends any ? () => T : never
+> extends () => infer R ? [...UnionToTuple<Exclude<T, R>>, R] : [];
+
+/**
+ * #### Build an array of elements from a flattened tuple of type "1" | "2" | "3" ...
+ * 
+ *  + Returns the final length of the array.
+ * 
+ * @template T The union type to be converted to a tuple and measured.
+ * @returns {number} The length of the tuple.
+ * @date 2025/2/11 18:12:02
+ */
+export type InferKeysLen<T> = UnionToTuple<T>["length"];

package/v2.d.mts

@@ -7,6 +7,10 @@
 */
 import type { TESIResponseOKMap } from "./v2";
 import { type ESIRequestOptions } from "./lib/rq-util.mjs";
+/**
+ * @returns Get The Current ESI request pending count.
+ */
+export declare const getRequestPending: () => number;
 /**
  * fire ESI request
  * @template {TESIEntryMethod} M

package/v2.mjs

@@ -1,5 +1,5 @@
 // import type { TESIResponseOKMap } from "eve-esi-types";
-import { is, curl, fetchP, replaceCbt, getSDEVersion, ESIRequesError, initOptions, isDebug, ESIErrorLimitReachedError, fireRequestsDoesNotRequireAuth } from "./lib/rq-util.mjs";
+import { is, curl, replaceCbt, getSDEVersion, initOptions, isDebug, fireRequestsDoesNotRequireAuth, isSuccess, handleESIError, handleSuccessResponse } from "./lib/rq-util.mjs";
 // - - - - - - - - - - - - - - - - - - - -
 //           constants, types
 // - - - - - - - - - - - - - - - - - - - -
@@ -22,6 +22,10 @@ let LOG = isDebug();
  */
 let ax = 0;
 const incrementAx = (minus) => minus ? ax-- : ax++;
+/**
+ * @returns Get The Current ESI request pending count.
+ */
+export const getRequestPending = () => ax;
 // - - - - - - - - - - - - - - - - - - - -
 //            main functions
 // - - - - - - - - - - - - - - - - - - - -
@@ -64,52 +68,16 @@ export async function fire(mthd, endp, pathParams, opt) {
     try {
         const res = await fetch(url, rqopt).finally(() => ax--);
         const { status } = res;
-        if (!res.ok && !actualOpt.ignoreError) {
-            if (status === 420) {
-                actualOpt.cancelable && actualOpt.cancelable.abort();
-                throw new ESIErrorLimitReachedError();
-            }
-            else {
-                // console.log(res);
-                throw new ESIRequesError(`${res.statusText} (status=${status})`);
-            }
-        }
-        else {
-            // DEVNOTE: - 204 No Content
-            if (status === 204) {
-                // this result is empty, decided to return status code.
-                return /** @type {R} */ ({ status });
-            }
-            /** @type {R} */
-            const data = await res.json();
-            if (actualOpt.ignoreError) {
-                // meaning `forceJson`?
-                return data;
-            }
-            // - - - - x-pages response.
-            // +undefined is NaN
-            // @ts-expect-error becouse +null is 0
-            const pc = +res.headers.get("x-pages");
-            // has remaining pages? NaN > 1 === false !isNaN(pageCount)
-            if (pc > 1) {
-                LOG && log('found "x-pages" header, pages: %d', pc);
-                const remData = await fetchP(endpointUrl, rqopt, up, pc, incrementAx);
-                // finally, decide product data.
-                if (isArray(data) && isArray(remData)) {
-                    // DEVNOTE: 2019/7/23 15:01:48 - types
-                    return /** @type {R} */ (data.concat(remData));
-                }
-                else {
-                    // @ts-expect-error TODO: fix type
-                    remData && Object.assign(data, remData);
-                }
-            }
-            return data;
+        // The parameters are different for successful and error responses.
+        if (isSuccess(status)) {
+            return handleSuccessResponse(res, endpointUrl, rqopt, up, incrementAx);
         }
+        // else if (isError(status)) {}
+        // Actually, throw Error
+        throw await handleESIError(res, endpointUrl, actualOpt.cancelable);
     }
     catch (e) {
-        // @ts-expect-error actualy endp is string
-        throw new ESIRequesError(`message: ${e.message}, endpoint=${endp}`);
+        throw e;
     }
 }
 // It should complete correctly.