eve-esi-types 2.2.6 → 2.3.2

package/v2/types-index.d.ts

@@ -6,10 +6,10 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 /**
- * THIS TSD IS AUTO GENERATED, DO NOT EDIT
+ * 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.2.6 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

@@ -6,7 +6,11 @@
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 import type { TESIResponseOKMap } from "./v2";
-import { type ESIRequestOptions } from "./rq-util.mjs";
+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 { curl, fetchP, replaceCbt, getSDEVersion, ESIRequesError, initOptions, isDebug, ESIErrorLimitReachedError, fireRequestsDoesNotRequireAuth } from "./rq-util.mjs";
+import { is, curl, replaceCbt, getSDEVersion, initOptions, isDebug, fireRequestsDoesNotRequireAuth, isSuccess, handleESIError, handleSuccessResponse } from "./lib/rq-util.mjs";
 // - - - - - - - - - - - - - - - - - - - -
 //           constants, types
 // - - - - - - - - - - - - - - - - - - - -
@@ -12,7 +12,7 @@ const isArray = Array.isArray;
 let LOG = isDebug();
 /**
  * @typedef {import("./v2").TESIResponseOKMap} TESIResponseOKMap
- * @typedef {import("./rq-util.mjs").ESIRequestOptions} ESIRequestOptions
+ * @typedef {import("./lib/rq-util.mjs").ESIRequestOptions} ESIRequestOptions
  */
 // - - - - - - - - - - - - - - - - - - - -
 //        module vars, functions
@@ -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.
@@ -125,7 +93,9 @@ async function getEVEStatus(fn) {
 // type following and run
 // node v2.mjs
 // or yarn test
-getEVEStatus(fire).then(eveStatus => console.log(eveStatus));
+if (!is("x")) {
+    getEVEStatus(fire).then(eveStatus => log(eveStatus));
+}
 // {
 //     "players": 16503,
 //     "server_version": "2794925",