eve-esi-types 3.1.0 → 3.1.3

package/README.md

@@ -100,4 +100,6 @@ const ret = await esiRequest.universe.get("/universe/structures/", { query: { fi
 
 ## References
 
-- [`ESI Types Utility Definitions`](./esi-types-util3.md)
+- [`ESI Types Utility Definitions`](./docs/esi-types-util3.md)
+
+- [`ESI Tagged Types Utility Definitions`](./docs/esi-tagged-types.md)

package/docs/esi-tagged-types.md

@@ -0,0 +1,120 @@
+# ESI Tagged Types
+
+This document provides an overview of the types defined in the `eve-esi-types/v2/esi-tagged-types.d.ts` file. These types are used to handle EVE Online ESI responses.
+
+## LCamelCase
+
+Converts a string to lower camel case.
+
+```typescript
+type LCamelCase<S extends string> = S extends `${infer P1} ${infer P2}`
+  ? `${Lowercase<P1>}${Capitalize<P2>}` : Lowercase<S>;
+```
+
+### Example
+
+```typescript
+// returns "assets"
+LCamelCase<"Assets">
+
+// returns "factionWarfare"
+LCamelCase<"Faction Warfare">
+```
+
+## InferSomethingBy
+
+Infers something by a brand.
+
+```typescript
+type InferSomethingByBrand<N = number> = N & { __enum: "InferSomethingBy" };
+type InferSomethingByMethod  = InferSomethingByBrand<0>;
+type InferSomethingByTags    = InferSomethingByBrand<1>;
+type InferSomethingBy<Tag, AsType extends InferSomethingByBrand = InferSomethingByMethod> = {
+  [M in TESIEntryMethod]: TESIResponseOKMap[M] extends Record<`/${string}/`, { tag: infer ActualTag }>
+    ? AsType extends InferSomethingByTags
+      ? ActualTag : ActualTag extends Tag
+        ? M
+      : never
+    : never;
+}[TESIEntryMethod];
+```
+
+## ESITags
+
+Maps HTTP methods to their corresponding tags.
+
+```typescript
+type ESITags = InferSomethingBy<never, InferSomethingByTags>;
+```
+
+## InferMethod
+
+Infers the HTTP method based on the provided tag.
+
+```typescript
+type InferMethod<Tag> = InferSomethingBy<Tag>;
+```
+
+## TaggedEndpointRequestFunction2
+
+Creates a function type for making requests to tagged endpoints.
+
+```typescript
+type TaggedEndpointRequestFunction2<
+  M extends TESIEntryMethod, Tag extends ESITags,
+  ActualOpt extends Record<string, unknown> = {},
+  EndPoints extends SelectEndpointByTag<Tag, M> = SelectEndpointByTag<Tag, M>,
+> = <
+    REP extends ReplacePathParams<EndPoints> | EndPoints,
+    EPX extends _InferEndpointOrigin<REP, EndPoints> extends never ? REP: _InferEndpointOrigin<REP, EndPoints>,
+    PPM extends InferPathParams<REP, EPX>,
+    Opt extends IdentifyParameters<M, EPX, ActualOpt & PPM>,
+    Ret extends InferESIResponseResult<M, EPX>,
+    HasOpt = HasRequireParams<M, EPX, PPM>,
+>(endpoint: REP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
+```
+
+## ESITaggedEndpointRequest2
+
+Maps tags to their corresponding endpoint request functions.
+
+```typescript
+type ESITaggedEndpointRequest2<Tag extends ESITags, ActualOpt extends Record<string, unknown> = {}> = {
+  [tag in Tag]: {
+    [method in InferMethod<Tag>]: TaggedEndpointRequestFunction2<method, tag, ActualOpt>;
+  };
+}[Tag];
+```
+
+## SelectEndpointByTag
+
+Selects an endpoint by tag and method.
+
+```typescript
+type SelectEndpointByTag<
+  Tag extends ESITags, M extends TESIEntryMethod
+> = {
+  [EP in keyof TESIResponseOKMap[M]]: TESIResponseOKMap[M][EP] extends { tag: infer ActualTag }
+    ? ActualTag extends Tag
+      ? EP : never
+    : never;
+}[keyof TESIResponseOKMap[M]];
+```
+
+## TaggedESIRequestMap2
+
+Maps lower camel case tags to their corresponding endpoint request functions.
+
+```typescript
+type TaggedESIRequestMap2<ActualOpt extends Record<string, unknown> = {}> = {
+  [tag in ESITags as LCamelCase<tag>]: ESITaggedEndpointRequest2<tag, ActualOpt>;
+};
+```
+
+## TaggedESIRequestMapPartial2
+
+Creates a partial map of lower camel case tags to their corresponding endpoint request functions.
+
+```typescript
+type TaggedESIRequestMapPartial2<Props extends LCamelCase<ESITags>> = RequireThese<Partial<TaggedESIRequestMap2>, Props>;
+```

package/{esi-types-util3.md → docs/esi-types-util3.md}

@@ -8,7 +8,7 @@
 
 # ESI Types Utility 3.1 Summary
 
-This document provides detailed explanations of each type defined in the `index.d.ts` file.
+This document provides detailed explanations of each type defined in the `eve-esi-types/v2/index.d.ts` file.
 
 > ## TESIRequestFunctionSignature2
 

package/lib/request-api.mjs

@@ -70,7 +70,7 @@ export const request2 = /** @type {IESIRequestFunction2} */ (async (method, endp
 //
 /** @type {TESIEntryMethod[]} */ (["get", "post", "put", "delete"]).forEach((method) => {
     request2[method] = /** @type {TESIRequestFunctionEachMethod2<typeof method, util.ESIRequestOptions>} */ ((endpoint, opt) => {
-        // @ts-expect-error TODO: ts(2345)
-        return request2(method, endpoint, opt);
+        // @ts-expect- error TODO: ts(2345)
+        return request2(method, endpoint, /** @type {Parameters<typeof request2>[2]} */ (opt));
     });
 });

package/lib/rq-util.d.mts

@@ -37,14 +37,6 @@ export type ESIRequestOptions = {
      * will need it for `POST` request etc.
      */
     body?: any;
-    /**
-     * cancel request immediately
-     */
-    cancelable?: AbortController;
-    /**
-     * Can be an empty object if no authentication is required.description
-     */
-    token?: TAcccessToken;
     /**
      * whether an authorization header is required
      *
@@ -57,7 +49,15 @@ export type ESIRequestOptions = {
      * @date 2025/3/13
      * @since v3.0.0
      */
-    pathParams?: number | number[];
+    pathParams?: number | [number, number];
+    /**
+     * Can be an empty object if no authentication is required.description
+     */
+    token?: TAcccessToken;
+    /**
+     * cancel request immediately
+     */
+    cancelable?: AbortController;
 };
 /**
  * @typedef {string | number | boolean} Truthy
@@ -141,7 +141,7 @@ 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
+ * @template {unknown} T
  * @param {string} endpointUrl
  * @param {RequestInit} rqopt request options
  * @param {URLSearchParams} usp queries
@@ -181,9 +181,9 @@ export declare function getLogger(): {
     clog: (...args: any[]) => void;
     rlog: (...args: any[]) => void;
 };
-export type TFireWithoutAuth = <M extends TESIEntryMethod, RealEP extends ReplacePathParams<ESIEndpointOf<M>> | ESIEndpointOf<M>, EPx extends ResolvedEndpoint<RealEP, M>, PathParams extends InferPathParams<RealEP, EPx>, Opt extends IdentifyParameters<M, EPx, ESIRequestOptions & PathParams>, R extends InferESIResponseResult<M, EPx>, HasOpt = HasRequireParams<M, EPx, PathParams>, XX = PickRequireParams<M, EPx, PathParams>>(fn: TESIRequestFunctionSignature2<ESIRequestOptions> | TESIRequestFunctionMethods2<ESIRequestOptions>, method: M, endpoint: RealEP, ...opt: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<R>;
-export interface IFireWithoutAuth {
-    <M extends TESIEntryMethod, RealEP extends ReplacePathParams<ESIEndpointOf<M>> | ESIEndpointOf<M>, EPx extends ResolvedEndpoint<RealEP, M>, PathParams extends InferPathParams<RealEP, EPx>, Opt extends IdentifyParameters<M, EPx, ESIRequestOptions & PathParams>, R extends InferESIResponseResult<M, EPx>, HasOpt = HasRequireParams<M, EPx, PathParams>, XX = PickRequireParams<M, EPx, PathParams>>(fn: TESIRequestFunctionSignature2<ESIRequestOptions> | TESIRequestFunctionMethods2<ESIRequestOptions>, method: M, endpoint: RealEP, ...opt: HasOpt extends 1 ? [Opt] : [Opt?]): Promise<R>;
+export type TFireWithoutAuth<ActualOpt extends Record<string, unknown> = ESIRequestOptions> = <Mtd extends TESIEntryMethod, REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd>, EPX extends ResolvedEndpoint<REP, Mtd>, PPM extends InferPathParams<REP, EPX>, Opt extends IdentifyParameters<Mtd, EPX, ActualOpt, PPM>, Ret extends InferESIResponseResult<Mtd, EPX>, HasOpt = HasRequireParams<Mtd, EPX, PPM>, XX = PickRequireParams<Mtd, EPX, PPM>>(fn: TESIRequestFunctionSignature2<ESIRequestOptions> | TESIRequestFunctionMethods2<ESIRequestOptions>, method: Mtd, endpoint: REP, ...opt: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
+export interface IFireWithoutAuth<ActualOpt extends Record<string, unknown> = ESIRequestOptions> {
+    <Mtd extends TESIEntryMethod, REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd>, EPX extends ResolvedEndpoint<REP, Mtd>, PPM extends InferPathParams<REP, EPX>, Opt extends IdentifyParameters<Mtd, EPX, ActualOpt, PPM>, Ret extends InferESIResponseResult<Mtd, EPX>, HasOpt = HasRequireParams<Mtd, EPX, PPM>, XX = PickRequireParams<Mtd, EPX, PPM>>(fn: TESIRequestFunctionSignature2<ActualOpt> | TESIRequestFunctionMethods2<ActualOpt>, method: Mtd, endpoint: REP, ...opt: HasOpt extends 1 ? [Opt] : [Opt?]): Promise<Ret>;
 }
 /**
  * Need typescript v5.5 later

package/lib/rq-util.mjs

@@ -228,7 +228,7 @@ export const initOptions = (method, opt) => {
  * fetch the extra pages
  *
  *   + if the `x-pages` header property ware more than 1
- * @template {any} T
+ * @template {unknown} T
  * @param {string} endpointUrl
  * @param {RequestInit} rqopt request options
  * @param {URLSearchParams} usp queries
@@ -347,8 +347,8 @@ type EPOriginNever2 = InferEndpointOrigin<"/characters/{character_id}/fittings/4
 const fireWithoutAuth = (fn, method, endpoint, ...opt) => {
     const arg = opt.length ? opt[0] : void 0;
     if (typeof fn === "function") {
-        // @ts-expect-error TODO: ts(2345) The argument type does not match the type of the specified parameter
-        return fn(method, endpoint, arg);
+        // @ts-expect- error TODO: ts(2345) The argument type does not match the type of the specified parameter
+        return fn(method, endpoint, /** @type {Parameters<typeof fn>[2]} */ (arg));
     }
     // @ts-expect-error TODO: ts(2345) The argument type does not match the type of the specified parameter
     return fn[method](endpoint, arg);
@@ -378,6 +378,7 @@ export async function fireRequestsDoesNotRequireAuth(fn) {
         clog();
         casefireWithoutAuth: {
             await fireWithoutAuth(fn, "get", `/characters/{character_id}/`, {
+                // auth: true, // ✅ At this point, the expected semantic error is successfully triggered as intended.
                 pathParams: ID_CCP_Zoetrope
             }).then(log);
             clog('(portrait)');
@@ -395,8 +396,8 @@ export async function fireRequestsDoesNotRequireAuth(fn) {
                     pathParams: 12354
                 });
                 await fireWithoutAuth(fn, "delete", `/characters/${1234}/fittings/${56789}/`, {
-                    pathParams: [1234, 56789], // ⚠️ TODO: A semantics error should be deliberately caused here
-                    auth: true
+                    auth: true,
+                    // pathParams: [1234, 56789], // ✅ At this point, the expected semantic error is successfully triggered as intended.
                 }).catch(console.log);
             }
         }

package/minimal-rq.mjs

@@ -29,8 +29,8 @@ const log = util.getUniversalLogger("[request-mini]: ");
 const esiMethods = /** @type {TESIRequestFunctionMethods2} */ ({});
 /** @satisfies {TESIEntryMethod[]} */ (["get", "post", "put", "delete"]).forEach((method) => {
     esiMethods[method] = /** @type {TESIRequestFunctionEachMethod2<typeof method, util.ESIRequestOptions>} */ ((endpoint, opt) => {
-        // @ts-expect-error ts(2345)
-        return request2(method, endpoint, opt);
+        // @ts-expect -error ts(2345)
+        return request2(method, endpoint, /** @type {Parameters<typeof request2>[2]} */ (opt));
     });
 });
 // It should complete correctly.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eve-esi-types",
-  "version": "3.1.0",
+  "version": "3.1.3",
   "description": "Extracted the main type of ESI. use for ESI request response types (version 2 only)",
   "main": "v2/index.d.ts",
   "scripts": {
@@ -15,6 +15,7 @@
     "v2",
     "lib",
     "web",
+    "docs",
     "*.d.mts",
     "*.mjs",
     "LICENSE",

package/tagged-rq.mjs

@@ -44,7 +44,7 @@ if (util.is("withError")) {
         // token: "s.s.s"
     })).then(console.log).catch(console.log);
     esi.fittings.delete("/characters/1234/fittings/56789/", {
-        pathParams: [1234, 56789], // ⚠️ TODO: A semantics error should be deliberately caused here
+        // pathParams: [1234, 56789], // ✅ At this point, the expected semantic error is successfully triggered as intended.
         auth: true
     });
     esi.character.post("/characters/affiliation/", {

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 3.1.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.1.3 of the EVE Online ESI response types.
  */
 import { TESIResponseOKMap } from "./index.d.ts";
 export * from "./index.d.ts";
@@ -61,26 +61,51 @@ export declare type ESITags = InferSomethingBy<never, InferSomethingByTags>
  * @date 2025/2/28
  */
 export declare type InferMethod<Tag> = InferSomethingBy<Tag>
-// type XAssets = InferMethod<"Assets">;
-// type XContacts = InferMethod<"Contacts">;
-// type XPlanetary = InferMethod<"Planetary Interaction">;
+/* ctt
+type XAssets = InferMethod<"Assets">;
+type XContacts = InferMethod<"Contacts">;
+type XPlanetary = InferMethod<"Planetary Interaction">;
+/*/
+//*/
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
 //    Utility Type `TaggedEndpointRequestFunction2`
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
+/**
+ * Infers the endpoint origin based on the provided endpoints.
+ * 
+ *  + Customed InferEndpointOrigin
+ * 
+ * @template RealEP - The real endpoint type.
+ * @template Endpoints - The possible endpoints.
+ * 
+ * @typeParam RealEP - The type of the real endpoint.
+ * @typeParam Endpoints - The type of the possible endpoints.
+ * 
+ * @returns The inferred endpoint origin.
+ */
+type _InferEndpointOrigin<
+  RealEP extends unknown, Endpoints extends string | number | symbol
+> = {
+  [EP in Endpoints]: RealEP extends ReplacePathParams<EP>
+    ? EP : never;
+}[Endpoints];
+
 /**
  * Creates a function type for making requests to tagged endpoints.
  * 
  * @template M - The HTTP method.
  * @template Tag - The tag associated with the endpoint.
  * @template ActualOpt - The actual options for the request.
- * @template EP - The endpoint path.
- * @template P2 - The path parameters.
+ * @template EndPoints - The possible endpoints.
+ * @template REP - The real endpoint path.
+ * @template EPX - The inferred endpoint origin.
+ * @template PPM - The path parameters.
  * @template Opt - The request options.
- * @template R - The response type.
+ * @template Ret - The response type.
+ * @template HasOpt - Indicates if the endpoint has required parameters.
  * 
  * @param endpoint - The endpoint path.
- * @param pathParams - The path parameters.
  * @param options - An optional object containing additional options for the request. If the endpoint has required parameters, this parameter must be provided.
  * @returns A promise that resolves to the response.
  * 
@@ -88,17 +113,18 @@ export declare type InferMethod<Tag> = InferSomethingBy<Tag>
  * The `...options: HasOpt extends 1 ? [Opt] : [Opt?]` parameter is defined this way to enforce that if the endpoint has required parameters,  
  * the `options` parameter must be provided. If there are no required parameters, the `options` parameter is optional.
  */
-// TODO: 2025/3/16 1:20:50 Generics bug maybe OK?
-export declare type TaggedEndpointRequestFunction2<M extends TESIEntryMethod, Tag extends ESITags, ActualOpt = {}> = <
-    RealEP extends ReplacePathParams<ESIEndpointOf<M>> | ESIEndpointOf<M>,
-    EPx extends ResolvedEndpoint<RealEP, M>,
-    PathParams extends InferPathParams<RealEP, EPx>,
-    Opt extends IdentifyParameters<M, EPx, ActualOpt & PathParams>,
-    R extends InferESIResponseResult<M, EPx>,
-    HasOpt = HasRequireParams<M, EPx, PathParams>,
-  // RealEPX = ReplacePathParamsX<RealEPX>,
-  // EPX = ReplacePathParams<EP>,
->(endpoint: RealEP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<R>;
+export declare type TaggedEndpointRequestFunction2<
+  M extends TESIEntryMethod, Tag extends ESITags,
+  ActualOpt extends Record<string, unknown> = {},
+  EndPoints extends SelectEndpointByTag<Tag, M> = SelectEndpointByTag<Tag, M>,
+> = <
+    REP extends ReplacePathParams<EndPoints> | EndPoints,
+    EPX extends _InferEndpointOrigin<REP, EndPoints> extends never ? REP: _InferEndpointOrigin<REP, EndPoints>,
+    PPM extends InferPathParams<REP, EPX>,
+    Opt extends IdentifyParameters<M, EPX, ActualOpt, PPM>,
+    Ret extends InferESIResponseResult<M, EPX>,
+    HasOpt = HasRequireParams<M, EPX, PPM>,
+>(endpoint: REP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
 
 
 // - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -108,9 +134,10 @@ export declare type TaggedEndpointRequestFunction2<M extends TESIEntryMethod, Ta
  * Maps tags to their corresponding endpoint request functions.
  * 
  * @template Tag - The tag to map.
+ * @template ActualOpt - The actual options for the request.
  * @date 2025/2/28
  */
-export declare type ESITaggedEndpointRequest2<Tag extends ESITags, ActualOpt = {}> = {
+export declare type ESITaggedEndpointRequest2<Tag extends ESITags, ActualOpt extends Record<string, unknown> = {}> = {
   [tag in Tag]: {
     [method in InferMethod<Tag>]: TaggedEndpointRequestFunction2<method, tag, ActualOpt>;
   };
@@ -135,14 +162,19 @@ export declare type SelectEndpointByTag<
       ? EP : never
     : never;
 }[keyof TESIResponseOKMap[M]];
-// type XAssetsEndpointGet = SelectEndpointByTag<"Assets", "get">;
-// type XAssetsEndpointPost = SelectEndpointByTag<"Assets", "post">;
+/* ctt
+type XAssetsEndpointGet = SelectEndpointByTag<"Assets", "get">;
+type XAssetsEndpointPost = SelectEndpointByTag<"Assets", "post">;
+/*/
+//*/
 
 /**
  * Maps lower camel case tags to their corresponding endpoint request functions.
+ * 
+ * @template ActualOpt - The actual options for the request.
  * @date 2025/3/12
  */
-export declare type TaggedESIRequestMap2<ActualOpt = {}> = {
+export declare type TaggedESIRequestMap2<ActualOpt extends Record<string, unknown> = {}> = {
   [tag in ESITags as LCamelCase<tag>]: ESITaggedEndpointRequest2<tag, ActualOpt>;
 };
 

package/v2/index.d.ts

@@ -9,7 +9,7 @@
  * 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 3.1.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.1.3 of the EVE Online ESI response types.
  */
 import type { TESIResponseOKMap } from "./response-map.d.ts";
 export type { TESIResponseOKMap } from "./response-map.d.ts";
@@ -163,6 +163,56 @@ export type __IdentifyParameters<
   // @ts-expect-error 
 > = RequireThese<Opt, Keys> & Pick<Entry, Keys>;
 
+//  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+//                         Internal types
+//  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+/**
+ * Defines the keys used in ESI entries.
+ */
+type ESIEntryKeys = "auth" | "query" | "body" | "pathParams";
+/**
+ * Restricts the keys of a type to the specified ones while excluding extra keys.
+ *
+ * This utility type is designed to enforce stricter semantics by marking unwanted keys as `never`.
+ *
+ * @template T - The original type to be constrained.
+ * @template T2 - The type to merge with the constrained type.
+ * @template K - The keys to retain in the resulting type.
+ * @template Extras - Automatically derived keys to exclude from the resulting type.
+ *
+ * @example
+ * ```ts
+ * type Original = { auth?: string; query?: string; body?: string; pathParams?: string; extra?: string };
+ * type Required = { auth: true; query: { test: "pen" | "pencil" } };
+ * type Restricted = RestrictKeys<Original, Required, "auth" | "query">;
+ * // Result: { auth: true; query: { test: "pen" | "pencil" }; body?: undefined; pathParams?: undefined; extra?: string | undefined }
+ * ```
+ */
+//* ctt
+type RestrictKeys<
+T, K extends keyof T,
+Extras = Exclude<ESIEntryKeys, K>
+> = {
+  [P in keyof T]: P extends K ? Pick<T, P>[P] :
+    P extends Extras ? never : T[P];
+};
+// type RequireEntry = {
+//   auth?: true;
+//   query?: { test: "pen" | "pencil" };
+//   body?: string;
+//   pathParams?: string;
+//   extra?: string
+// };
+// type Restricted = RestrictKeys<RequireEntry, "auth" | "query">;
+/*/
+type RestrictKeys<
+  T, T2,
+  K extends keyof T,
+  Extras = Exclude<ESIEntryKeys, K>
+> = T2 & {
+  [P in keyof T as P extends K ? never : P]: P extends Extras ? never : T[P];
+};
+//*/
 
 declare global {
 
@@ -195,12 +245,12 @@ declare global {
    * This function sends a request to a specified endpoint and returns a response.
    * 
    * @template ActualOpt - The actual type of the option.
-   * @template M - The HTTP method to use for the request
-   * @template RealEP - The real path of the ESI endpoint to send the request to
-   * @template EP - The parameterized path of the ESI endpoint to send the request to
-   * @template PathParams - Parameters to include in the request if the endpoint is parameterized
+   * @template Mtd - The HTTP method to use for the request
+   * @template REP - The real path of the ESI endpoint to send the request to
+   * @template EPX - The parameterized path of the ESI endpoint to send the request to
+   * @template PPM - Parameters to include in the request if the endpoint is parameterized
    * @template Opt - Options to include in the request. If there is a required parameter, its type will be merged with `ActualOpt`
-   * @template R - The response type
+   * @template Ret - The response type
    * 
    * @param method - The HTTP method to use for the request (e.g., "get", "post").
    * @param endpoint - The real path of the ESI endpoint to send the request to.
@@ -213,28 +263,28 @@ declare global {
    * the `options` parameter must be provided. If there are no required parameters, the `options` parameter is optional.
    */
   type TESIRequestFunctionSignature2<ActualOpt> = <
-    M extends TESIEntryMethod,
-    RealEP extends ReplacePathParams<ESIEndpointOf<M>> | ESIEndpointOf<M>,
-    EPx extends ResolvedEndpoint<RealEP, M>,
-    PathParams extends InferPathParams<RealEP, EPx>,
-    Opt extends IdentifyParameters<M, EPx, ActualOpt & PathParams>,
-    R extends InferESIResponseResult<M, EPx>,
-    HasOpt = HasRequireParams<M, EPx, PathParams>,
-  >(method: M, endpoint: RealEP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<R>;
+    Mtd extends TESIEntryMethod,
+    REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd>,
+    EPX extends ResolvedEndpoint<REP, Mtd>,
+    PPM extends InferPathParams<REP, EPX>,
+    Opt extends IdentifyParameters<Mtd, EPX, ActualOpt, PPM>,
+    Ret extends InferESIResponseResult<Mtd, EPX>,
+    HasOpt = HasRequireParams<Mtd, EPX, PPM>,
+  >(method: Mtd, endpoint: REP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
 
   /**
    * Represents a function that can make ESI requests for a specific HTTP method.
    *
    * This type is used to define functions that send requests to specific ESI endpoints using a given HTTP method.
    *
-   * @template M - The HTTP method to use for the request.
+   * @template Mtd - The HTTP method to use for the request.
    * @template ActualOpt - The actual type of the options.
    *
-   * @template RealEP - The real path of the ESI endpoint to send the request to.
-   * @template EP - The parameterized path of the ESI endpoint to send the request to.
-   * @template PathParams - Parameters to include in the request if the endpoint is parameterized.
+   * @template REP - The real path of the ESI endpoint to send the request to.
+   * @template EPX - The parameterized path of the ESI endpoint to send the request to.
+   * @template PPM - Parameters to include in the request if the endpoint is parameterized.
    * @template Opt - Options to include in the request. If there is a required parameter, its type will be merged with `ActualOpt`.
-   * @template R - The response type.
+   * @template Ret - The response type.
    *
    * @param endpoint - The real path of the ESI endpoint to send the request to.
    * @param options - An optional object containing additional options for the request. If the endpoint has required parameters, this parameter must be provided.
@@ -245,14 +295,14 @@ declare global {
    * The `...options: HasOpt extends 1 ? [Opt] : [Opt?]` parameter is defined this way to enforce that if the endpoint has required parameters,  
    * the `options` parameter must be provided. If there are no required parameters, the `options` parameter is optional.
    */
-  type TESIRequestFunctionEachMethod2<M extends TESIEntryMethod, ActualOpt = {}> = <
-    RealEP extends ReplacePathParams<ESIEndpointOf<M>> | ESIEndpointOf<M>,
-    EPx extends ResolvedEndpoint<RealEP, M>,
-    PathParams extends InferPathParams<RealEP, EPx>,
-    Opt extends IdentifyParameters<M, EPx, ActualOpt & PathParams>,
-    R extends InferESIResponseResult<M, EPx>,
-    HasOpt = HasRequireParams<M, EPx, PathParams>,
-  >(endpoint: RealEP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<R>;
+  type TESIRequestFunctionEachMethod2<Mtd extends TESIEntryMethod, ActualOpt = {}> = <
+    REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd>,
+    EPX extends ResolvedEndpoint<REP, Mtd>,
+    PPM extends InferPathParams<REP, EPX>,
+    Opt extends IdentifyParameters<Mtd, EPX, ActualOpt, PPM>,
+    Ret extends InferESIResponseResult<Mtd, EPX>,
+    HasOpt extends HasRequireParams<Mtd, EPX, PPM> = HasRequireParams<Mtd, EPX, PPM>,
+  >(endpoint: REP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
 
   /**
    * Replaces path parameters in a string with numbers.
@@ -426,20 +476,23 @@ declare global {
     M extends TESIEntryMethod,
     EPx extends ESIEndpointOf<M> | string,
     Opt extends Record<string, unknown>,
+    AdditionalParams,
     Entry = _ESIResponseType<M, EPx>,
-    Keys = Exclude<keyof Entry, "result" | "tag" | "cachedSeconds">
-    // @ts-expect-error 
-  > = RequireThese<Opt, Keys> & Pick<Entry, Keys>;
+    Keys = Exclude<keyof (Entry & AdditionalParams), "result" | "tag" | "cachedSeconds">
+    // @ts-expect- error 
+  > = RestrictKeys<Opt, Keys> & Pick<Entry, Keys> & AdditionalParams;
   /*/
+  // DEVNOTE: 2025/3/24
+  // The definition is simple and highly maintainable, but it is not possible to reference the `pathParams` property when implementing `TESIRequestFunctionSignature2` etc.
   type IdentifyParameters<
-    Entry, Opt,
-    Keys = Exclude<keyof Entry, "result" | "tag" | "cachedSeconds">
-    // @ts-expect-error 
-  > = RequireThese<Opt, Keys> & Pick<Entry, Keys>;
-  // type IdentifyParameters<
-  //   Entry, Opt,
-  //   Keys = Exclude<keyof Entry, "result">
-  // > = Opt & (Keys extends keyof Entry ? Pick<Entry, Keys> : {});
+    M extends TESIEntryMethod,
+    EPx extends ESIEndpointOf<M> | string,
+    Opt extends Record<string, unknown>,
+    AdditionalParams,
+    Entry = _ESIResponseType<M, EPx>,
+    Keys = Exclude<keyof (Entry & AdditionalParams), "result" | "tag" | "cachedSeconds">
+    // @ts-expect- error 
+  > = RestrictKeys<Opt, Pick<Entry, Keys> & AdditionalParams, Keys>;
   //*/
 
   /**

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 3.1.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.1.3 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 3.1.0 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.1.3 of the EVE Online ESI response types.
  */
 import "./get_wars_ok.d.ts";
 import "./get_status_ok.d.ts";