eve-esi-types 2.0.0-beta → 2.0.2-beta

package/v2/post_universe_ids_ok.d.ts

@@ -1,141 +1,60 @@
 /**
- * ESI endpoint: /universe/ids/
- */
-
-/**
- * id integer
- */
-type PostUniverseIdsId = number;
-/**
- * name string
- */
-type PostUniverseIdsName = string;
+* ESI endpoint: /universe/ids/
+*/
 /**
  * agents array
  *
  * @maxItems 500
  */
 type PostUniverseIdsAgents = PostUniverseIdsAgent[];
-/**
- * id integer
- */
-type PostUniverseIdsAllianceId = number;
-/**
- * name string
- */
-type PostUniverseIdsAllianceName = string;
 /**
  * alliances array
  *
  * @maxItems 500
  */
 type PostUniverseIdsAlliances = PostUniverseIdsAlliance[];
-/**
- * id integer
- */
-type PostUniverseIdsCharacterId = number;
-/**
- * name string
- */
-type PostUniverseIdsCharacterName = string;
 /**
  * characters array
  *
  * @maxItems 500
  */
 type PostUniverseIdsCharacters = PostUniverseIdsCharacter[];
-/**
- * id integer
- */
-type PostUniverseIdsConstellationId = number;
-/**
- * name string
- */
-type PostUniverseIdsConstellationName = string;
 /**
  * constellations array
  *
  * @maxItems 500
  */
 type PostUniverseIdsConstellations = PostUniverseIdsConstellation[];
-/**
- * id integer
- */
-type PostUniverseIdsCorporationId = number;
-/**
- * name string
- */
-type PostUniverseIdsCorporationName = string;
 /**
  * corporations array
  *
  * @maxItems 500
  */
 type PostUniverseIdsCorporations = PostUniverseIdsCorporation[];
-/**
- * id integer
- */
-type PostUniverseIdsFactionId = number;
-/**
- * name string
- */
-type PostUniverseIdsFactionName = string;
 /**
  * factions array
  *
  * @maxItems 500
  */
 type PostUniverseIdsFactions = PostUniverseIdsFaction[];
-/**
- * id integer
- */
-type PostUniverseIdsInventoryTypeId = number;
-/**
- * name string
- */
-type PostUniverseIdsInventoryTypeName = string;
 /**
  * inventory_types array
  *
  * @maxItems 500
  */
 type PostUniverseIdsInventoryTypes = PostUniverseIdsInventoryType[];
-/**
- * id integer
- */
-type PostUniverseIdsRegionId = number;
-/**
- * name string
- */
-type PostUniverseIdsRegionName = string;
 /**
  * regions array
  *
  * @maxItems 500
  */
 type PostUniverseIdsRegions = PostUniverseIdsRegion[];
-/**
- * id integer
- */
-type PostUniverseIdsStationId = number;
-/**
- * name string
- */
-type PostUniverseIdsStationName = string;
 /**
  * stations array
  *
  * @maxItems 500
  */
 type PostUniverseIdsStations = PostUniverseIdsStation[];
-/**
- * id integer
- */
-type PostUniverseIdsSystemId = number;
-/**
- * name string
- */
-type PostUniverseIdsSystemName = string;
 /**
  * systems array
  *
@@ -163,79 +82,139 @@ interface PostUniverseIdsOk {
  * agent object
  */
 interface PostUniverseIdsAgent {
-  id?: PostUniverseIdsId;
-  name?: PostUniverseIdsName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * alliance object
  */
 interface PostUniverseIdsAlliance {
-  id?: PostUniverseIdsAllianceId;
-  name?: PostUniverseIdsAllianceName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * character object
  */
 interface PostUniverseIdsCharacter {
-  id?: PostUniverseIdsCharacterId;
-  name?: PostUniverseIdsCharacterName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * constellation object
  */
 interface PostUniverseIdsConstellation {
-  id?: PostUniverseIdsConstellationId;
-  name?: PostUniverseIdsConstellationName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * corporation object
  */
 interface PostUniverseIdsCorporation {
-  id?: PostUniverseIdsCorporationId;
-  name?: PostUniverseIdsCorporationName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * faction object
  */
 interface PostUniverseIdsFaction {
-  id?: PostUniverseIdsFactionId;
-  name?: PostUniverseIdsFactionName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * inventory_type object
  */
 interface PostUniverseIdsInventoryType {
-  id?: PostUniverseIdsInventoryTypeId;
-  name?: PostUniverseIdsInventoryTypeName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * region object
  */
 interface PostUniverseIdsRegion {
-  id?: PostUniverseIdsRegionId;
-  name?: PostUniverseIdsRegionName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * station object
  */
 interface PostUniverseIdsStation {
-  id?: PostUniverseIdsStationId;
-  name?: PostUniverseIdsStationName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }
 /**
  * system object
  */
 interface PostUniverseIdsSystem {
-  id?: PostUniverseIdsSystemId;
-  name?: PostUniverseIdsSystemName;
+/**
+ * id integer
+ */
+  id?: number;
+/**
+ * name string
+ */
+  name?: string;
   [k: string]: unknown | undefined;
 }

package/v2/post_universe_names_ok.d.ts

@@ -1,7 +1,6 @@
 /**
- * ESI endpoint: /universe/names/
- */
-
+* ESI endpoint: /universe/names/
+*/
 /**
  * category string
  */
@@ -15,14 +14,6 @@ type PostUniverseNamesCategory =
   | "solar_system"
   | "station"
   | "faction";
-/**
- * id integer
- */
-type PostUniverseNamesId = number;
-/**
- * name string
- */
-type PostUniverseNamesName = string;
 /**
  * 200 ok array
  *
@@ -35,7 +26,13 @@ type PostUniverseNamesOk = PostUniverseNames_200Ok[];
  */
 interface PostUniverseNames_200Ok {
   category: PostUniverseNamesCategory;
-  id: PostUniverseNamesId;
-  name: PostUniverseNamesName;
+/**
+ * id integer
+ */
+  id: number;
+/**
+ * name string
+ */
+  name: string;
   [k: string]: unknown | undefined;
 }

package/v2/put_characters_character_id_calendar_event_id_response.d.ts

@@ -1,7 +1,6 @@
 /**
- * ESI endpoint: /characters/{character_id}/calendar/{event_id}/
- */
-
+* ESI endpoint: /characters/{character_id}/calendar/{event_id}/
+*/
 /**
  * response string
  */

package/v2/put_characters_character_id_contacts_contact_ids.d.ts

@@ -1,7 +1,6 @@
 /**
- * ESI endpoint: /characters/{character_id}/contacts/
- */
-
+* ESI endpoint: /characters/{character_id}/contacts/
+*/
 /**
  * contact_ids array
  *
@@ -9,10 +8,12 @@
  * @maxItems 100
  */
 type PutCharactersCharacterIdContactsContactIds = [
-  PutCharactersCharacterIdContactsContactId,
-  ...PutCharactersCharacterIdContactsContactId[]
-];
 /**
  * ID of the contact to edit
  */
-type PutCharactersCharacterIdContactsContactId = number;
+  number,
+/**
+ * ID of the contact to edit
+ */
+  ...number[]
+];

package/v2/put_characters_character_id_mail_mail_id_contents.d.ts

@@ -1,27 +1,23 @@
 /**
- * ESI endpoint: /characters/{character_id}/mail/{mail_id}/
- */
-
-/**
- * label integer
- */
-type PutCharactersCharacterIdMailMailIdLabel = number;
+* ESI endpoint: /characters/{character_id}/mail/{mail_id}/
+*/
 /**
  * Labels to assign to the mail. Pre-existing labels are unassigned.
  *
  * @maxItems 25
  */
-type PutCharactersCharacterIdMailMailIdLabels = PutCharactersCharacterIdMailMailIdLabel[];
-/**
- * Whether the mail is flagged as read
- */
-type PutCharactersCharacterIdMailMailIdRead = boolean;
 
 /**
  * contents object
  */
 interface PutCharactersCharacterIdMailMailIdContents {
-  labels?: PutCharactersCharacterIdMailMailIdLabels;
-  read?: PutCharactersCharacterIdMailMailIdRead;
+/**
+ * label integer
+ */
+  labels?: number[];
+/**
+ * Whether the mail is flagged as read
+ */
+  read?: boolean;
   [k: string]: unknown | undefined;
 }

package/v2/put_fleets_fleet_id_members_member_id_movement.d.ts

@@ -1,7 +1,6 @@
 /**
- * ESI endpoint: /fleets/{fleet_id}/members/{member_id}/
- */
-
+* ESI endpoint: /fleets/{fleet_id}/members/{member_id}/
+*/
 /**
  * If a character is moved to the `fleet_commander` role, neither `wing_id` or `squad_id` should be specified. If a character is moved to the `wing_commander` role, only `wing_id` should be specified. If a character is moved to the `squad_commander` role, both `wing_id` and `squad_id` should be specified. If a character is moved to the `squad_member` role, both `wing_id` and `squad_id` should be specified.
  */
@@ -10,21 +9,19 @@ type PutFleetsFleetIdMembersMemberIdRole =
   | "wing_commander"
   | "squad_commander"
   | "squad_member";
-/**
- * squad_id integer
- */
-type PutFleetsFleetIdMembersMemberIdSquadId = number;
-/**
- * wing_id integer
- */
-type PutFleetsFleetIdMembersMemberIdWingId = number;
 
 /**
  * movement object
  */
 interface PutFleetsFleetIdMembersMemberIdMovement {
   role: PutFleetsFleetIdMembersMemberIdRole;
-  squad_id?: PutFleetsFleetIdMembersMemberIdSquadId;
-  wing_id?: PutFleetsFleetIdMembersMemberIdWingId;
+/**
+ * squad_id integer
+ */
+  squad_id?: number;
+/**
+ * wing_id integer
+ */
+  wing_id?: number;
   [k: string]: unknown | undefined;
 }

package/v2/put_fleets_fleet_id_new_settings.d.ts

@@ -1,21 +1,18 @@
 /**
- * ESI endpoint: /fleets/{fleet_id}/
- */
+* ESI endpoint: /fleets/{fleet_id}/
+*/
 
 /**
- * Should free-move be enabled in the fleet
+ * new_settings object
  */
-type PutFleetsFleetIdIsFreeMove = boolean;
+interface PutFleetsFleetIdNewSettings {
 /**
- * New fleet MOTD in CCP flavoured HTML
+ * Should free-move be enabled in the fleet
  */
-type PutFleetsFleetIdMotd = string;
-
+  is_free_move?: boolean;
 /**
- * new_settings object
+ * New fleet MOTD in CCP flavoured HTML
  */
-interface PutFleetsFleetIdNewSettings {
-  is_free_move?: PutFleetsFleetIdIsFreeMove;
-  motd?: PutFleetsFleetIdMotd;
+  motd?: string;
   [k: string]: unknown | undefined;
 }

package/v2/put_fleets_fleet_id_squads_squad_id_naming.d.ts

@@ -1,16 +1,14 @@
 /**
- * ESI endpoint: /fleets/{fleet_id}/squads/{squad_id}/
- */
-
-/**
- * name string
- */
-type PutFleetsFleetIdSquadsSquadIdName = string;
+* ESI endpoint: /fleets/{fleet_id}/squads/{squad_id}/
+*/
 
 /**
  * naming object
  */
 interface PutFleetsFleetIdSquadsSquadIdNaming {
-  name: PutFleetsFleetIdSquadsSquadIdName;
+/**
+ * name string
+ */
+  name: string;
   [k: string]: unknown | undefined;
 }

package/v2/put_fleets_fleet_id_wings_wing_id_naming.d.ts

@@ -1,16 +1,14 @@
 /**
- * ESI endpoint: /fleets/{fleet_id}/wings/{wing_id}/
- */
-
-/**
- * name string
- */
-type PutFleetsFleetIdWingsWingIdName = string;
+* ESI endpoint: /fleets/{fleet_id}/wings/{wing_id}/
+*/
 
 /**
  * naming object
  */
 interface PutFleetsFleetIdWingsWingIdNaming {
-  name: PutFleetsFleetIdWingsWingIdName;
+/**
+ * name string
+ */
+  name: string;
   [k: string]: unknown | undefined;
 }

package/v2.mjs

@@ -120,7 +120,8 @@ const curl = (endp) => {
 // It should complete correctly.
 async function getEVEStatus() {
     try {
-        const ok = await fire("get", "/characters/{character_id}/ship/", 994562, { auth: true, token: "<accessToken of 994562>" });
+        const ok = await fire("get", "/characters/{character_id}/ship/", 94892443, { auth: true, token: "eyJhbGciOiJSUzI1NiIsImtpZCI6IkpXVC1TaWduYXR1cmUtS2V5IiwidHlwIjoiSldUIn0.eyJzY3AiOlsiZXNpLWxvY2F0aW9uLnJlYWRfbG9jYXRpb24udjEiLCJlc2ktbG9jYXRpb24ucmVhZF9zaGlwX3R5cGUudjEiLCJlc2ktbWFpbC5vcmdhbml6ZV9tYWlsLnYxIiwiZXNpLW1haWwucmVhZF9tYWlsLnYxIiwiZXNpLW1haWwuc2VuZF9tYWlsLnYxIiwiZXNpLXNraWxscy5yZWFkX3NraWxscy52MSIsImVzaS1za2lsbHMucmVhZF9za2lsbHF1ZXVlLnYxIiwiZXNpLXdhbGxldC5yZWFkX2NoYXJhY3Rlcl93YWxsZXQudjEiLCJlc2ktc2VhcmNoLnNlYXJjaF9zdHJ1Y3R1cmVzLnYxIiwiZXNpLWNsb25lcy5yZWFkX2Nsb25lcy52MSIsImVzaS1jaGFyYWN0ZXJzLnJlYWRfY29udGFjdHMudjEiLCJlc2ktdW5pdmVyc2UucmVhZF9zdHJ1Y3R1cmVzLnYxIiwiZXNpLWFzc2V0cy5yZWFkX2Fzc2V0cy52MSIsImVzaS11aS53cml0ZV93YXlwb2ludC52MSIsImVzaS1maXR0aW5ncy5yZWFkX2ZpdHRpbmdzLnYxIiwiZXNpLWZpdHRpbmdzLndyaXRlX2ZpdHRpbmdzLnYxIiwiZXNpLW1hcmtldHMuc3RydWN0dXJlX21hcmtldHMudjEiLCJlc2ktY2hhcmFjdGVycy5yZWFkX2xveWFsdHkudjEiLCJlc2ktY2hhcmFjdGVycy5yZWFkX2FnZW50c19yZXNlYXJjaC52MSIsImVzaS1pbmR1c3RyeS5yZWFkX2NoYXJhY3Rlcl9qb2JzLnYxIiwiZXNpLW1hcmtldHMucmVhZF9jaGFyYWN0ZXJfb3JkZXJzLnYxIiwiZXNpLWxvY2F0aW9uLnJlYWRfb25saW5lLnYxIiwiZXNpLWNvbnRyYWN0cy5yZWFkX2NoYXJhY3Rlcl9jb250cmFjdHMudjEiLCJlc2ktY2xvbmVzLnJlYWRfaW1wbGFudHMudjEiLCJlc2ktY2hhcmFjdGVycy5yZWFkX2ZhdGlndWUudjEiLCJlc2ktYXNzZXRzLnJlYWRfY29ycG9yYXRpb25fYXNzZXRzLnYxIl0sImp0aSI6IjlmN2I2MDYwLWQ2N2EtNDZlNi1iOTZmLWJlYzJlYzM3MjU2MSIsImtpZCI6IkpXVC1TaWduYXR1cmUtS2V5Iiwic3ViIjoiQ0hBUkFDVEVSOkVWRTo5NDg5MjQ0MyIsImF6cCI6IjQyMDdlZjU1ODVjMjRjNDQ4MTU4Y2JhYTA1MmIzNjJiIiwidGVuYW50IjoidHJhbnF1aWxpdHkiLCJ0aWVyIjoibGl2ZSIsInJlZ2lvbiI6IndvcmxkIiwiYXVkIjpbIjQyMDdlZjU1ODVjMjRjNDQ4MTU4Y2JhYTA1MmIzNjJiIiwiRVZFIE9ubGluZSJdLCJuYW1lIjoiSmVmZiBHYWxsZXQiLCJvd25lciI6Im1vaDB4NjU5T0hLcytTcXBlWHFQTHIzYjdTcz0iLCJleHAiOjE3Mzc2NjI1NDksImlhdCI6MTczNzY2MTM0OSwiaXNzIjoiaHR0cHM6Ly9sb2dpbi5ldmVvbmxpbmUuY29tIn0.l4VBLlNxozB9c4AZf__fea_le_3eAoYG3XNKhUyaRzR0IJzQ1R5kyKHz5-ACH5Hz9H9JzQPq1cdVbI0mCdqVbnfHMYVp13p76H-yCwcG9lhO1x_Y2K5QkzkvtH_e0FkTu8rUjPNFc-8yv3BY7vsWWskVvxJoUnyEOvVpD192-L8xjG4FRZ5AYWMhG2XmbP1-6-OSY2ok1jHan6-CJDbKha2L3YjHRGV33VpdLHVXRFxDtW2iMpTRfx8l9VEvJKwgYtex1zB-0RprcafKRoBG_vA3nOBUCqoptWw08_N8vsnOsyPhHJ_VD5qOSfWnBgDEXk1RmvzRqETSXL1yN7zq-Q" });
+        console.log(ok);
     }
     catch (error) {
         console.error("Failed to get character ship -", error);
@@ -131,8 +132,8 @@ async function getEVEStatus() {
  * fire ESI request
  * @template {TESIEntryMethod} M
  * @template {keyof TESIResponseOKMap[M]} EP
- * @template {IdentifyParameters<TESIResponseOKMap[M][EP] & { result: any }, ESIRequestOptions>} Opt
- * @template {TESIResponseOKMap[M][EP] extends { result: infer U } ? U : never} R
+ * @template {IdentifyParameters<TESIResponseOKMap[M][EP], ESIRequestOptions>} Opt
+ * @template {InferESIResponseResult<M, EP>} R
  *
  * @param {M} mthd
  * @param {EP} endp - The endpoint to request.
@@ -244,7 +245,9 @@ export async function fire(mthd, endp, pathParams, opt) {
         throw new ESIRequesError(`message: ${e.message}, endpoint=${endp}`);
     }
 }
+// type following and run
 // node v2.mjs
+// or yarn test:v2
 getEVEStatus().then(eveStatus => console.log(eveStatus));
 // {
 //     "players": 16503,

package/v2.mts

@@ -170,6 +170,7 @@ const curl = (endp: string) => {
 async function getEVEStatus() {
     try {
         const ok = await fire("get", "/characters/{character_id}/ship/", 994562, { auth: true, token: "<accessToken of 994562>" });
+        console.log(ok);
     } catch (error) {
         console.error("Failed to get character ship -", error);
     }
@@ -179,8 +180,8 @@ async function getEVEStatus() {
  * fire ESI request
  * @template {TESIEntryMethod} M
  * @template {keyof TESIResponseOKMap[M]} EP
- * @template {IdentifyParameters<TESIResponseOKMap[M][EP] & { result: any }, ESIRequestOptions>} Opt
- * @template {TESIResponseOKMap[M][EP] extends { result: infer U } ? U : never} R
+ * @template {IdentifyParameters<TESIResponseOKMap[M][EP], ESIRequestOptions>} Opt
+ * @template {InferESIResponseResult<M, EP>} R
  * 
  * @param {M} mthd
  * @param {EP} endp - The endpoint to request.
@@ -193,8 +194,9 @@ async function getEVEStatus() {
 export async function fire<
     M extends TESIEntryMethod,
     EP extends keyof TESIResponseOKMap[M],
-    Opt extends IdentifyParameters<TESIResponseOKMap[M][EP] & { result: any }, ESIRequestOptions>,
-    R extends TESIResponseOKMap[M][EP] extends { result: infer U } ? U : never
+    // Entry extends TESIResponseOKMap[M][EP],
+    Opt extends IdentifyParameters<TESIResponseOKMap[M][EP], ESIRequestOptions>,
+    R extends InferESIResponseResult<M, EP>
 >(
     mthd: M, endp: EP, pathParams?: number | number[] | Opt,
     opt?: Opt
@@ -307,7 +309,9 @@ export async function fire<
     }
 }
 
+// type following and run
 // node v2.mjs
+// or yarn test:v2
 getEVEStatus().then(eveStatus => console.log(eveStatus));
 // {
 //     "players": 16503,

package/v2/post_characters_character_id_contacts_contact_ids.d.ts

@@ -1,18 +0,0 @@
-/**
- * ESI endpoint: /characters/{character_id}/contacts/
- */
-
-/**
- * contact_ids array
- *
- * @minItems 1
- * @maxItems 100
- */
-type PostCharactersCharacterIdContactsContactIds = [
-  PostCharactersCharacterIdContactsContactId,
-  ...PostCharactersCharacterIdContactsContactId[]
-];
-/**
- * ID of the contact to edit
- */
-type PostCharactersCharacterIdContactsContactId = number;

package/v2/post_characters_character_id_cspa_characters.d.ts

@@ -1,18 +0,0 @@
-/**
- * ESI endpoint: /characters/{character_id}/cspa/
- */
-
-/**
- * characters array
- *
- * @minItems 1
- * @maxItems 100
- */
-type PostCharactersCharacterIdCspaCharacters = [
-  PostCharactersCharacterIdCspaCharacter,
-  ...PostCharactersCharacterIdCspaCharacter[]
-];
-/**
- * character integer
- */
-type PostCharactersCharacterIdCspaCharacter = number;