eve-esi-types 3.2.4 → 3.2.6

package/CHANGELOG.md

@@ -2,6 +2,32 @@
 
 All notable changes to this project will be documented in this file.
 
+## [3.2.6] - 2025-04-24
+
+### 🐛 Bug Fixes
+
+- `normalizeOptions` bug
+
+### ⚙️ Miscellaneous Tasks
+
+- Update CHANGELOG.md
+- Update "main" field in package.json to point to dist folder
+- Bump version to v3.2.6
+
+## [3.2.5] - 2025-04-24
+
+### 💼 Other
+
+- Refactor v2/experimental-esi-types.d.ts
+
+### ⚙️ Miscellaneous Tasks
+
+- Update CHANGELOG.md
+- Relocate v2 files to dist/v2 directory
+- Update import paths to reflect new structure
+- Update jsconfig.json for improved path resolution
+- Bump version to v3.2.5
+
 ## [3.2.4] - 2025-04-22
 
 ### 🚜 Refactor

package/{v2 → dist/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.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import type { TESIResponseOKMap } from "./index.d.ts";
 export type * from "./index.d.ts";

package/{v2 → dist/v2}/experimental-esi-types.d.ts

@@ -9,10 +9,22 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/experimental-esi-types.d.ts
- * @summary This file is auto-generated and defines version 3.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import type { _ESIResponseType, PickPathParameters, UnionToTuple, Split } from "./index.d.ts";
 
+// - - - - - - - - - - - - - - - - - - - - - - - - - -
+//           TESIRequestFunctionWithContext
+// - - - - - - - - - - - - - - - - - - - - - - - - - -
+export type TESIRequestFunctionWithContext<
+  CTX extends TESIRequestFunctionContext,
+  Mtd extends TESIEntryMethod = CTX["method"],
+  // @ts-expect-error TODO: 2025/4/24
+  REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd> = CTX["endpoint"],
+  ActualOpt extends Record<string, unknown> = CTX["options"]
+> = (context: CTX) => Promise<NonNullable<CTX["result"]>>;
+
+
 /**
  * Infers the response result type of an ESI endpoint based on a union of HTTP method and endpoint.
  * 
@@ -93,6 +105,17 @@ export type ResolveNextEndpoint<
     : never;
 }[Endpoints];
 
+
+export type SplitEndpointUnion<
+  S extends ESIEndpointUnions, D extends string = ":",
+  AR extends any[] = Split<S, D>
+> = AR[0] extends TESIEntryMethod
+  ? AR[1] extends Exclude<ESIEndpointOf<AR[0]>, symbol>
+    ? AR: never
+  : never;
+// // Test cases
+// type Test1 = SplitEndpointUnion<"post:/universe/ids/">;
+
 /**
  * Resolves the next applicable ESI endpoint based on a union of HTTP method and endpoint.
  * 
@@ -117,10 +140,8 @@ export type ResolveNextEndpoint<
  */
 export type ResolveNextEndpointFromUnion<
   EPU extends ESIEndpointUnions,
-  SplitM_EP = Split<EPU>,
-  // @ts-expect-error
+  SplitM_EP extends [TESIEntryMethod, any] = SplitEndpointUnion<EPU>,
   M extends TESIEntryMethod = SplitM_EP[0],
-  // @ts-expect-error
   EP extends Exclude<ESIEndpointOf<M>, symbol> = SplitM_EP[1],
   BaseResut extends InferESIResponseResult<M, EP> = InferESIResponseResult<M, EP>,
   Endpoints extends ESIEndpointOf<M> = ESIEndpointOf<M>,
@@ -219,7 +240,7 @@ type ValidateEndpointParamsInArray<
 export type ResolveNextEndpointLoos<
   M extends TESIEntryMethod,
   /* ctt
-  // DEVNOTE: As it turns out, the behavior of this utility type is broken unless you use the "skipLibCheck=true".
+  // DEVNOTE: By applying "skipLibCheck=true", typescript semantics error will not occur.
   EP extends ESIEndpointOf<M> = ESIEndpointOf<M>,
   Endpoints extends ESIEndpointOf<M> = ESIEndpointOf<M>,
   /*/

package/{v2 → dist/v2}/index.d.ts

@@ -9,10 +9,10 @@
  * 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.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import type { TESIResponseOKMap } from "./response-map.d.ts";
-import type { PickPathParameters, InferKeysLen } from "./util.d.ts";
+import type { PickPathParameters, InferKeysLen, CombineIntersection } from "./util.d.ts";
 import type {
   _ESIResponseType,
   _IfNeedPathParams,
@@ -54,28 +54,35 @@ type ESIEntryKeys = "auth" | "query" | "body" | "pathParams";
  * ```
  */
 //* ctt
-type RestrictKeys<
-  T, RequireKeys extends keyof T,
+// incomplete
+export type RestrictKeys<
+  T, RequireKeys/*  extends keyof T */,
   Extras = Exclude<ESIEntryKeys, RequireKeys>
 > = {
   [P in keyof T]: 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">;
+export type RestrictKeys2<
+    T,
+    RequireKeys extends keyof T,
+    Extras = Exclude<keyof T, RequireKeys>
+> = (
+  // 1. Include and make the required keys mandatory
+  {
+    [RQ in keyof T as RQ extends RequireKeys ? RQ : never]-?: T[RQ];
+  } &
+  // 2. Exclude extra keys from ESIEntryKeys and assign `never`
+  {
+    [Extra in ESIEntryKeys as Extra extends Extras ? Extra : never]?: never;
+  } &
+  // 3. Include remaining keys (not in ESIEntryKeys) as optional with their original types
+  {
+    [Other in keyof T as Other extends Extras ? (Other extends ESIEntryKeys ? never : Other) : never]?: T[Other];
+  }
+) extends infer O
+    // Flatten the intersected type into a single object
+    ? { [K in keyof O]: O[K] }
+    : never;
 /*/
-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 {
@@ -140,6 +147,23 @@ declare global {
     HasOpt = HasRequireParams<Mtd, EPX, PPM>,
   >(method: Mtd, endpoint: REP, ...options: HasOpt extends 1 ? [Opt] : [Opt?]) => Promise<Ret>;
 
+  
+  type TESIRequestFunctionContext<
+    Mtd extends TESIEntryMethod = TESIEntryMethod,
+    REP extends ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd> = ReplacePathParams<ESIEndpointOf<Mtd>> | ESIEndpointOf<Mtd>,
+    ActualOpt extends Record<string, unknown> = Record<string, unknown>,
+
+    EPX extends ResolvedEndpoint<REP, Mtd> = ResolvedEndpoint<REP, Mtd>,
+    PPM extends InferPathParams<REP, EPX> = InferPathParams<REP, EPX>,
+    Opt extends IdentifyParameters<Mtd, EPX, ActualOpt, PPM> = IdentifyParameters<Mtd, EPX, ActualOpt, PPM>,
+    Ret extends InferESIResponseResult<Mtd, EPX> = InferESIResponseResult<Mtd, EPX>,
+    HasOpt = HasRequireParams<Mtd, EPX, PPM>,
+  > = {
+    method: Mtd; endpoint: REP;
+  } & (HasOpt extends 1 ? { options: Opt } : { options?: Opt }) & {
+    result?: Ret;
+  };
+
   /**
    * A function signature type for making enhanced ESI requests.
    *
@@ -392,28 +416,24 @@ declare global {
    * @see {@link _ESIResponseType}
    * @see Documentation of [`IdentifyParameters`](https://github.com/jeffy-g/eve-esi-types/blob/master/docs/v2/identify-parameters.md)
    */
-  //* ctt
+  /* ctt
   type IdentifyParameters<
     M extends TESIEntryMethod,
     EPx extends ESIEndpointOf<M> | string,
     Opt extends Record<string, unknown>,
-    AdditionalParams,
-    Entry = _ESIResponseType<M, EPx> & AdditionalParams,
-    RequireKeys = Exclude<keyof (Entry & AdditionalParams), "result" | "tag" | "cachedSeconds">
-    // @ts-expect-error 
-  > = RestrictKeys<Opt, RequireKeys> & Pick<Entry, RequireKeys> & AdditionalParams;
+    PathParams,
+    EntryWithParams = _ESIResponseType<M, EPx> & PathParams,
+    RequireKeys extends keyof EntryWithParams = Exclude<keyof EntryWithParams, "result" | "tag" | "cachedSeconds">
+  > = RestrictKeys<Opt, RequireKeys> & Pick<EntryWithParams, RequireKeys>;
   /*/
-  // 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<
     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>;
+    PathParams,
+    EntryWithParams = _ESIResponseType<M, EPx> & PathParams,
+    RequireKeys extends keyof EntryWithParams = Exclude<keyof EntryWithParams, "result" | "tag" | "cachedSeconds">
+  > = CombineIntersection< RestrictKeys<Opt, RequireKeys> & Pick<EntryWithParams, RequireKeys> >;
   //*/
 
   /**

package/{v2 → dist/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.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import "./types-index.d.ts";
 

package/{v2 → dist/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.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import "./globals/alliance.d.ts";
 import "./globals/assets.d.ts";

package/{v2 → dist/v2}/types-util.d.ts

@@ -9,7 +9,7 @@
  * THIS DTS IS AUTO GENERATED, DO NOT EDIT
  * 
  * @file eve-esi-types/v2/types-util.d.ts
- * @summary This file is auto-generated and defines version 3.2.4 of the EVE Online ESI response types.
+ * @summary This file is auto-generated and defines version 3.2.5 of the EVE Online ESI response types.
  */
 import type { TESIResponseOKMap } from "./response-map.d.ts";
 

package/{v2 → dist/v2}/util.d.ts

@@ -16,10 +16,18 @@
  * @template Path The string representing the endpoint path.
  * @returns {string | never} The parameter name if the path is parameterized, otherwise `never`.
  */
+//* ctt
 export type PickPathParameters<Path extends string> =
   Path extends `${string}/{${infer Param}}/${infer Rest}`
   ? Param | PickPathParameters<`/${Rest}`>
   : never;
+/*/
+export type PickPathParameters<Path extends string> =
+  Path extends `${string}/{${infer Param}}/${string}/{${infer Param2}}/${string}`
+  ? Param | Param2 : Path extends `${string}/{${infer Param}}/${string}`
+    ? Param
+  : never;
+//*/
 
 /**
  * Convert a union type to an intersection type.
@@ -70,3 +78,10 @@ export type Split<S extends string, D extends string = ":"> =
 // // Expected: ['a', 'b', 'c']
 // type Test3 = Split<"hello", ",">;
 // // Expected: ['hello']
+
+//* ctt
+// export type CombineIntersection<IS> = IS extends infer O ? { [K in keyof O]: O[K] } : never;
+export type CombineIntersection<IS extends Record<string, unknown>> = { [K in keyof IS]: IS[K] };
+/*/
+export type CombineIntersection<IS> = IS;
+//*/

package/jsconfig.json

@@ -1,18 +1,18 @@
 {
   "$schema": "https://json.schemastore.org/tsconfig",
   "compilerOptions": {
-    // This flag is required
+    // "skipDefaultLibCheck": true,
     // "skipLibCheck": true,
     // This flag is required
     "checkJs": true,
     // This flag is required
     "strict": true,
     "noEmit": true,
-    "listFiles": true,
-    // "skipDefaultLibCheck": true,
+    "allowJs": true,
+    // "listFiles": true,
     // "target": "esnext",
     // "module": "esnext",
-    // "diagnostics": true,
+    "diagnostics": true,
     // "moduleResolution": "node",
     "rootDirs": [
       "./"
@@ -22,7 +22,7 @@
     "./*.mjs",
     "./lib/*.mjs",
     // "./lib/*.d.mts",
-    "./v2/**/*.d.ts"
+    "./dist/v2/**/*.d.ts"
   ],
   "exclude": [
   ]

package/lib/request-api.d.mts

@@ -6,10 +6,10 @@
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
 import * as util from "./rq-util.mjs";
-import type { IESIRequestFunction2 } from "../v2";
+import type { IESIRequestFunction2 } from "../dist/v2";
 /**
- * @typedef {import("../v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
- * @typedef {import("../v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
+ * @typedef {import("../dist/v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
+ * @typedef {import("../dist/v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
  */
 /** #### Sample of `TESIRequestFunctionSignature`
  *
@@ -19,7 +19,7 @@ import type { IESIRequestFunction2 } from "../v2";
  * @type {IESIRequestFunction2}
  * @param method - The HTTP method to use for the request
  * @param endpoint - The Path of the ESI endpoint to send the request to
- * @param options - An object of options to include in the request
+ * @param opt - An object of options to include in the request
  * @returns A Promise object containing the response data
  * @throws {util.ESIRequestError}
  */

package/lib/request-api.mjs

@@ -5,7 +5,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="../v2"/>
+/// <reference types="../dist/v2"/>
 // - - - - - - - - - - - - - - - - - - - -
 //               imports
 // - - - - - - - - - - - - - - - - - - - -
@@ -17,8 +17,8 @@ import * as util from "./rq-util.mjs";
 const log = util.getUniversalLogger("[request-api]: ");
 const DEBUG = util.isDebug();
 /**
- * @typedef {import("../v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
- * @typedef {import("../v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
+ * @typedef {import("../dist/v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
+ * @typedef {import("../dist/v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
  */
 // - - - - - - - - - - - - - - - - - - - -
 //            main functions
@@ -31,21 +31,21 @@ const DEBUG = util.isDebug();
  * @type {IESIRequestFunction2}
  * @param method - The HTTP method to use for the request
  * @param endpoint - The Path of the ESI endpoint to send the request to
- * @param options - An object of options to include in the request
+ * @param opt - An object of options to include in the request
  * @returns A Promise object containing the response data
  * @throws {util.ESIRequestError}
  */
 export const request2 = /** @type {IESIRequestFunction2} */ (async (method, endpoint, opt) => {
+    // When only options are provided
+    const actualOpt = /** @type {NonNullable<typeof opt> & util.ESIRequestOptions} */ (opt || {});
     /** @type {number[]=} */
     let pathParams;
-    if (typeof opt?.pathParams === "number" || Array.isArray(opt?.pathParams)) {
-        pathParams = /** @type {number[]} */ (Array.isArray(opt.pathParams) ? opt.pathParams : [opt.pathParams]);
+    if (typeof actualOpt.pathParams === "number" || Array.isArray(actualOpt.pathParams)) {
+        pathParams = /** @type {number[]} */ (Array.isArray(actualOpt.pathParams) ? actualOpt.pathParams : [actualOpt.pathParams]);
     }
     if (Array.isArray(pathParams)) {
         endpoint = util.replaceCbt(endpoint, pathParams);
     }
-    // When only options are provided
-    const actualOpt = /** @type {NonNullable<typeof opt>} */ (opt || {});
     const { rqopt, qss } = util.initOptions(method, actualOpt);
     const endpointUrl = util.curl(endpoint);
     const up = new URLSearchParams(qss);

package/lib/rq-util.d.mts

@@ -5,7 +5,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="../v2"/>
+/// <reference types="../dist/v2"/>
 // - - - - - - - - - - - - - - - - - - - -
 //               imports
 // - - - - - - - - - - - - - - - - - - - -
@@ -16,7 +16,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-import type { TESIRequestFunctionMethods2 } from "../v2";
+import type { TESIRequestFunctionMethods2 } from "../dist/v2";
 import type { TESIErrorStats } from "./esi-error-types";
 export { isNode } from "./constants.mjs";
 /**
@@ -77,6 +77,12 @@ export declare class ESIErrorLimitReachedError extends ESIRequestError {
 /**
  * @typedef {import("./rq-util.mjs").ESIRequestOptions} ESIRequestOptions
  */
+/**
+ * @template T
+ * @param {[T] | [(T | undefined)?]} opt
+ * @returns {NonNullable<T>}
+ */
+export declare const normalizeOptions: <T extends unknown>(opt: [T] | [(T | undefined)?]) => NonNullable<T>;
 /**
  * #### status: 200 | 201 | 204
  *

package/lib/rq-util.mjs

@@ -5,7 +5,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="../v2"/>
+/// <reference types="../dist/v2"/>
 // - - - - - - - - - - - - - - - - - - - -
 //               imports
 // - - - - - - - - - - - - - - - - - - - -
@@ -51,6 +51,20 @@ export class ESIErrorLimitReachedError extends ESIRequestError {
 // - - - - - - - - - - - - - - - - - - - -
 //            utility functions
 // - - - - - - - - - - - - - - - - - - - -
+/**
+ * @template T
+ * @param {[T] | [(T | undefined)?]} opt
+ * @returns {NonNullable<T>}
+ */
+export const normalizeOptions = (opt) => {
+    //* ctt
+    return /** @type {NonNullable<T>} */ (opt.length ? (opt[0] ?? {}) : {});
+    /*/
+    const r = /** @type {NonNullable<T>} * /(opt.length ? (opt[0] ?? {}): {}) as NonNullable<T>;
+    log(`normalizeOptions::[${JSON.stringify(r)}]`);
+    return r;
+    //*/
+};
 /**
  * #### status: 200 | 201 | 204
  *
@@ -326,7 +340,7 @@ export function getLogger() {
 }
 /**
  * Need typescript v5.5 later
- * @import * as ESI from "../v2";
+ * @import * as ESI from "../dist/v2";
  * @typedef {ESI.TESIRequestFunctionMethods2<ESIRequestOptions>} TESIRequestFunctionMethods2
  */
 /**
@@ -338,12 +352,12 @@ export function getLogger() {
  * @type {TESIEnhancedRequestFunctionSignature<TPrependParams, ESIRequestOptions>}
  */
 const fireWithoutAuth = (fn, method, endpoint, ...opt) => {
+    const arg = opt.length ? opt[0] : void 0;
     if (typeof fn === "function") {
-        const arg = opt.length ? opt[0] : void 0;
         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, ...opt);
+    return fn[method](endpoint, arg);
 };
 const token = `token.token.token`;
 /**

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

@@ -5,7 +5,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="../v2/esi-tagged-types"/>
+/// <reference types="../dist/v2/esi-tagged-types"/>
 import type { ESIRequestOptions } from "./rq-util.mjs";
 /**
  * Decorates the ESI request body into a tagged ESI request map.
@@ -30,4 +30,4 @@ export declare function decoreateESIRequestBody<Opt extends Record<string, unkno
  * @since 2.x
  * @type {XESI.TaggedESIRequestMap2<ESIRequestOptions>}
  */
-export declare const esi: import("../v2/esi-tagged-types").TaggedESIRequestMap2<ESIRequestOptions>;
+export declare const esi: import("../dist/v2/esi-tagged-types").TaggedESIRequestMap2<ESIRequestOptions>;

package/lib/tagged-request-api.mjs

@@ -5,13 +5,13 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="../v2/esi-tagged-types"/>
+/// <reference types="../dist/v2/esi-tagged-types"/>
 /**
  * @file eve-esi-types/lib/tagged-request-api.mts
  */
 import { request2 } from "./request-api.mjs";
 /**
- * @import { TESIRequestFunctionMethods2 } from "../v2"
+ * @import { TESIRequestFunctionMethods2 } from "../dist/v2"
  */
 /**
  * @typedef {`${string}${"" | `,${string}`}`} TMethodList

package/minimal-rq.mjs

@@ -5,7 +5,7 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="./v2"/>
+/// <reference types="./dist/v2"/>
 // - - - - - - - - - - - - - - - - - - - -
 //               imports
 // - - - - - - - - - - - - - - - - - - - -
@@ -17,8 +17,8 @@ import { request2 } from "./lib/request-api.mjs";
 // shorthands
 const log = util.getUniversalLogger("[request-mini]: ");
 /**
- * @typedef {import("./v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
- * @typedef {import("./v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
+ * @typedef {import("./dist/v2").IESIRequestFunction2<util.ESIRequestOptions>} IESIRequestFunction2
+ * @typedef {import("./dist/v2").TESIRequestFunctionMethods2<util.ESIRequestOptions>} TESIRequestFunctionMethods2
  */
 // - - - - - - - - - - - - - - - - - - - -
 //            main functions

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "eve-esi-types",
-  "version": "3.2.4",
+  "version": "3.2.6",
   "description": "Extracted the main type of ESI. use for ESI request response types (version 2 only)",
-  "main": "v2/index.d.ts",
+  "main": "dist/v2/index.d.ts",
   "scripts": {
     "start": "tsc -p jsconfig.json",
     "test": "node request-v3.mjs -debug",
@@ -13,7 +13,7 @@
     "url": "git+ssh://git@github.com/jeffy-g/eve-esi-types.git"
   },
   "files": [
-    "v2",
+    "dist",
     "lib",
     "web",
     "*.d.mts",

package/request-v3.d.mts

@@ -1,11 +1,4 @@
-/*!
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-  Copyright (C) 2025 jeffy-g <hirotom1107@gmail.com>
-  Released under the MIT license
-  https://opensource.org/licenses/mit-license.php
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-*/
-import { type ESIRequestOptions } from "./lib/rq-util.mjs";
+import type { ESIRequestOptions } from "./lib/rq-util.mjs";
 /**
  * @returns Get The Current ESI request pending count.
  */

package/request-v3.mjs

@@ -5,13 +5,15 @@
   https://opensource.org/licenses/mit-license.php
  - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="./v2"/>
+/**
+ * @file request-v3.mts
+ * @command node request-v3.mjs
+ */
+/// <reference types="./dist/v2"/>
 // - - - - - - - - - - - - - - - - - - - -
 //               imports
 // - - - - - - - - - - - - - - - - - - - -
-// import type { TESIResponseOKMap, TPathParamsNever } from "./v2";
-// import type { TESIResponseOKMap } from "eve-esi-types";
-import { is, curl, replaceCbt, getSDEVersion, initOptions, isDebug, fireRequestsDoesNotRequireAuth, isSuccess, handleESIError, handleSuccessResponse } from "./lib/rq-util.mjs";
+import { is, curl, replaceCbt, getSDEVersion, normalizeOptions, initOptions, isDebug, fireRequestsDoesNotRequireAuth, isSuccess, handleESIError, handleSuccessResponse, } from "./lib/rq-util.mjs";
 // - - - - - - - - - - - - - - - - - - - -
 //           constants, types
 // - - - - - - - - - - - - - - - - - - - -
@@ -21,9 +23,8 @@ const isArray = Array.isArray;
 /**
  * enable/disable console.log
  */
-let LOG = isDebug();
+const LOG = isDebug();
 /**
- * @typedef {import("./v2").TESIResponseOKMap} TESIResponseOKMap
  * @typedef {import("./lib/rq-util.mjs").ESIRequestOptions} ESIRequestOptions
  * @typedef {import("./lib/rq-util.mjs").ESIRequestError} ESIRequestError
  * @typedef {import("./lib/rq-util.mjs").Truthy} Truthy
@@ -50,17 +51,17 @@ export const getRequestPending = () => ax;
  * @throws {ESIRequestError}
  * @async
  */
-export const fire = /** @type {TESIRequestFunctionSignature2<ESIRequestOptions>} */ (async (mthd, endp, opt) => {
+export const fire = /** @type {TESIRequestFunctionSignature2<ESIRequestOptions>} */ (async (mthd, endp, ...opt) => {
+    // When only options are provided
+    const actualOpt = normalizeOptions(opt);
     /** @type {number[]=} */
     let pathParams;
-    if (opt && typeof opt.pathParams !== "undefined") {
-        pathParams = typeof opt.pathParams === "number" ? [opt.pathParams] : isArray(opt.pathParams) ? opt.pathParams : void 0;
+    if (actualOpt.pathParams) {
+        pathParams = typeof actualOpt.pathParams === "number" ? [actualOpt.pathParams] : isArray(actualOpt.pathParams) ? actualOpt.pathParams : void 0;
     }
     if (isArray(pathParams)) {
         endp = replaceCbt(endp, pathParams);
     }
-    // When only options are provided
-    const actualOpt = opt || /** @type {NonNullable<typeof opt>} */ ({});
     const { rqopt, qss } = initOptions(mthd, actualOpt);
     const endpointUrl = curl(endp);
     const up = new URLSearchParams(qss);

package/tagged-rq.mjs

@@ -5,13 +5,14 @@
 //  https://opensource.org/licenses/mit-license.php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 */
-/// <reference types="./v2"/>
+/// <reference types="./dist/v2"/>
 /**
  * @file tagged-rq.mts
  * @command node tagged-rq.mjs -x -debug
  */
 import { esi } from "./lib/tagged-request-api.mjs";
 import * as util from "./lib/rq-util.mjs";
+const ID_CCP_Zoetrope = 2112625428;
 // Furthermore, the endpoint selected is narrowed down by "tags" and "method".
 esi.alliance.get("/alliances/").then(aIds => {
     console.log(`get:alliances, id size=${aIds.length}`);
@@ -19,7 +20,7 @@ esi.alliance.get("/alliances/").then(aIds => {
     //     esi.alliance.get(`/alliances/${aid}/`).then(console.log);
     // }
 });
-esi.character.get("/characters/{character_id}/", { pathParams: 2112625428 }).then(console.log);
+esi.character.get("/characters/{character_id}/", { pathParams: ID_CCP_Zoetrope }).then(console.log);
 esi.universe.post("/universe/ids/", {
     body: ["the forge", "plex"]
 }).then(console.log);
@@ -27,18 +28,27 @@ esi.universe.post("/universe/names/", {
     body: [44992, 434243723, 109299958, 10000002]
 }).then(console.log);
 esi.universe.get("/universe/structures/", { query: { filter: "market" } }).then(console.log);
+esi.wars.get("/wars/", { query: { max_war_id: 20 } }).then(warIds => {
+    console.log(`get:alliances, id size=${warIds.length}`);
+    // for (const wid of warIds) {
+    //     esi.wars.get(`/wars/${wid}/`).then(console.log);
+    // }
+});
+esi.character.post("/characters/affiliation/", {
+    body: [ID_CCP_Zoetrope]
+}).then(console.log);
 // node tagged-rq.mjs -x -debug -withError
 if (util.is("withError")) {
-    esi.assets.get("/characters/2112625428/assets/", {
+    esi.assets.get(`/characters/${ID_CCP_Zoetrope}/assets/`, {
         auth: true
     }).then(console.log).catch(console.log);
-    esi.mail.post("/characters/2112625428/mail/", /** @satisfies {Pick<TESIResponsePostEntry<"/characters/{character_id}/mail/">, "auth" | "body">} */ ({
+    esi.mail.post(`/characters/${ID_CCP_Zoetrope}/mail/`, /** @satisfies {Pick<TESIResponsePostEntry<"/characters/{character_id}/mail/">, "auth" | "body">} */ ({
         auth: true,
         body: {
             subject: "test!!",
             body: "",
             recipients: [{
-                    recipient_id: 2112625428, recipient_type: "character"
+                    recipient_id: ID_CCP_Zoetrope, recipient_type: "character"
                 }]
         },
         // token: "s.s.s"