warframe-worldstate-parser 2.20.3 → 2.22.0

package/lib/CambionCycle.js

@@ -5,6 +5,7 @@ const WorldstateObject = require('./WorldstateObject');
 /**
  * Represents the current Cambion Drift Fass/Vome Cycle
  * @extends {WorldstateObject}
+ * @property {string} timeLeft time rendering of amount of time left
  */
 module.exports = class CambionCycle extends WorldstateObject {
   /**
@@ -18,6 +19,7 @@ module.exports = class CambionCycle extends WorldstateObject {
     ({
       activation: this.activation,
       expiry: this.expiry,
+      timeLeft: this.timeLeft,
     } = cetusCycle);
 
     this.active = cetusCycle.isDay ? 'fass' : 'vome';

package/lib/SentientOutpost.js

@@ -40,9 +40,11 @@ const sat = () => {
  * @property {Date}    previous.expiry     When the mission became or becomes inactive
  */
 class SentientOutpost {
-  constructor(data = '{\\"sfn\\":000}', {
+  constructor(data, {
     translator, locale, sentientData, logger,
   }) {
+    // eslint-disable-next-line no-param-reassign
+    if (!data) data = '{"sfn":000}';
     const node = (data.match(/\d{3}/g) || ['000'])[0];
     const id = `CrewBattleNode${node}`;
     if (node === '000') {

package/lib/SteelPathOffering.js

@@ -15,7 +15,7 @@ function getFirstDayOfWeek() {
 
 function getLastDayOfWeek() {
   const last = new Date(getFirstDayOfWeek());
-  last.setUTCDate(last.getUTCDate() + 4);
+  last.setUTCDate(last.getUTCDate() + 6);
   last.setUTCHours(23);
   last.setUTCMinutes(59);
   last.setUTCSeconds(59);

package/lib/SyndicateJob.js

@@ -5,95 +5,17 @@ const fetch = require('node-fetch');
 const WorldstateObject = require('./WorldstateObject');
 
 const apiBase = process.env.API_BASE_URL || 'https://api.warframestat.us';
-const bountyRewardRegex = /Tier(A|B|C|D|E)Table(A|B|C)Rewards/i;
-const ghoulRewardRegex = /GhoulBountyTable(A|B)Rewards/i;
+const bountyRewardRegex = /Tier([ABCDE])Table([ABC])Rewards/i;
+const ghoulRewardRegex = /GhoulBountyTable([AB])Rewards/i;
 
 /**
  * Determine the level string for the bounty
- * @param  {string[]} bountyMatches list of bounty matches
- * @param  {string} tier          bounty tier identifier
- * @param  {boolean} cambion      whether or not the bounty is a cambion bounty
- * @param  {boolean} isVault      whether or not the bounty is a vault run
+ * @param  {Object} job Original raw job data
  * @returns {string}               level range string
  */
-const getLevelString = (bountyMatches, tier, cambion, isVault) => {
-  let levelString = '';
-  if (bountyMatches && bountyMatches.length) {
-    if (!cambion) {
-      switch (tier) {
-        case 'A':
-          levelString = '5 - 15';
-          break;
-        case 'B':
-          levelString = '10 - 30';
-          break;
-        case 'C':
-          levelString = '20 - 40';
-          break;
-        case 'D':
-          levelString = '30 - 50';
-          break;
-        case 'E':
-          levelString = '40 - 60';
-          break;
-        default:
-          break;
-      }
-    } else if (isVault) {
-      switch (tier) {
-        case 'A':
-          levelString = '30 - 40';
-          break;
-        case 'B':
-          levelString = '40 - 50';
-          break;
-        case 'C':
-          levelString = '50 - 60';
-          break;
-        default:
-          break;
-      }
-    } else {
-      switch (tier) {
-        case 'A':
-          levelString = '5 - 15';
-          break;
-        case 'B':
-          levelString = '15 - 25';
-          break;
-        case 'C':
-          levelString = '25 - 30';
-          break;
-        case 'D':
-          levelString = '30 - 40';
-          break;
-        case 'E':
-          levelString = '40 - 60';
-          break;
-        case 'F':
-          levelString = '100 - 100';
-          break;
-        default:
-          break;
-      }
-    }
-  } else {
-    switch (tier) {
-      case 'A':
-        levelString = '15 - 25';
-        break;
-      case 'B':
-        levelString = '40 - 50';
-        break;
-      default:
-        break;
-    }
-  }
+const getLevelString = (job) => `${job.minEnemyLevel} - ${job.maxEnemyLevel}`;
 
-  return levelString;
-};
-
-const determineLocation = (i18n, isVault) => {
+const determineLocation = (i18n, isVault, raw) => {
   const last = String(i18n).split('/').slice(-1)[0];
 
   const bountyMatches = last.match(bountyRewardRegex);
@@ -104,11 +26,8 @@ const determineLocation = (i18n, isVault) => {
   const isCetus = /eidolonjob/i.test(i18n);
   const isVallis = /venusjob/i.test(i18n);
   const isDeimos = /deimosmissionrewards/i.test(i18n);
-
-  // eslint-disable-next-line no-nested-ternary
-  const tier = isBounty ? bountyMatches[1] : (isGhoul ? ghoulMatches[1] : '');
   const rotation = isBounty ? bountyMatches[2] : '';
-  const levelString = getLevelString(bountyMatches, tier, isDeimos, isVault);
+  const levelString = getLevelString(raw);
 
   let location;
   let levelClause;
@@ -133,24 +52,26 @@ const determineLocation = (i18n, isVault) => {
   return { location, locationWRot };
 };
 
-const getBountyRewards = async (i18n, isVault) => {
-  try {
-    const { location, locationWRot } = determineLocation(i18n, isVault);
-    const url = `${apiBase}/drops/search/${encodeURIComponent(location)}?grouped_by=location`;
-    const reply = await fetch(url).then((res) => res.json()).catch(() => {}); // swallow errors
-    const pool = (reply || {})[locationWRot];
-    if (!pool) {
-      return ['Pattern Mismatch. Results inaccurate.'];
-    }
-    const results = pool.rewards;
-    if (results) {
-      return Array.from(new Set(results.map((result) => result.item)));
-    }
-  } catch (e) {
-    // eslint-disable-next-line no-console
-    console.error(e);
+const getBountyRewards = async (i18n, isVault, raw) => {
+  let location;
+  let locationWRot;
+  if (i18n.endsWith('PlagueStarTableRewards')) {
+    location = 'plague star';
+    locationWRot = 'Earth/Cetus (Level 15 - 25 Plague Star), Rot A';
+  }
+  if (!location || !locationWRot) {
+    ({ location, locationWRot } = determineLocation(i18n, isVault, raw));
+  }
+  const url = `${apiBase}/drops/search/${encodeURIComponent(location)}?grouped_by=location`;
+  const reply = await fetch(url).then((res) => res.json()).catch(() => {}); // swallow errors
+  const pool = (reply || {})[locationWRot];
+  if (!pool) {
+    return ['Pattern Mismatch. Results inaccurate.'];
+  }
+  const results = pool.rewards;
+  if (results) {
+    return Array.from(new Set(results.map((result) => result.item)));
   }
-
   return [];
 };
 
@@ -174,7 +95,7 @@ class SyndicateJob extends WorldstateObject {
      * @type {Array.<String>}
      */
     this.rewardPool = [];
-    getBountyRewards(data.rewards, data.isVault)
+    getBountyRewards(data.rewards, data.isVault, data)
       .then((rewards) => {
         this.rewardPool = rewards;
       });

package/lib/VoidTrader.js

@@ -2,6 +2,7 @@
 
 const WorldstateObject = require('./WorldstateObject');
 const VoidTraderItem = require('./VoidTraderItem');
+const VoidTraderSchedule = require('./VoidTraderSchedule');
 
 /**
  * Represents a void trader
@@ -53,7 +54,7 @@ class VoidTrader extends WorldstateObject {
      * The void trader's name
      * @type {string}
      */
-    this.character = data.Character.replace('Baro\'Ki Teel', 'Baro Ki\'Teer');
+    this.character = data.Character ? data.Character.replace('Baro\'Ki Teel', 'Baro Ki\'Teer') : '';
 
     /**
      * The node at which the Void Trader appears
@@ -94,6 +95,13 @@ class VoidTrader extends WorldstateObject {
      * @type {string}
      */
     this.endString = this.getEndString();
+
+    this.initialStart = timeDate.parseDate(data.InitialStartDate);
+    this.completed = data.Completed;
+    this.schedule = data.ScheduleInfo
+      ? data.ScheduleInfo
+        .map((i) => new VoidTraderSchedule(i, { timeDate, translator, locale }))
+      : [];
   }
 
   /**

package/lib/VoidTraderItem.js

@@ -8,7 +8,7 @@
  */
 class VoidTraderItem {
   /**
-   * @param   {Object}             data            The challenge instance data
+   * @param   {Object}             data            The void trader item data
    * @param   {string}             data.ItemType   Worldstate Item i18n path
    * @param   {string}             data.PrimePrice Ducat cost of the item
    * @param   {string}             data.RegularPrice Credit price of the item

package/lib/VoidTraderSchedule.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = class VoidTraderSchedule {
+  constructor(data, { timeDate, translator, locale }) {
+    this.expiry = timeDate.parseDate(data.Expiry);
+    this.item = translator.languageString(data.FeaturedItem, locale);
+  }
+};

package/lib/WorldEvent.js

@@ -15,7 +15,7 @@ const SyndicateJob = require('./SyndicateJob');
 
 /**
  * Progress for one of multiple stages
- * @typedef {Object} ProgessStep
+ * @typedef {Object} ProgressStep
  *
  * @property {string} type
  * @property {Number} progressAmt

package/lib/WorldState.js

@@ -89,9 +89,6 @@ function parseArray(ParserClass, dataArray, deps, uniqueField) {
       if (Object.prototype.hasOwnProperty.call(obj, 'active')) {
         return obj.active;
       }
-      if (Object.prototype.hasOwnProperty.call(obj, 'expired')) {
-        return obj.expired;
-      }
       return true;
     });
   }
@@ -304,5 +301,7 @@ module.exports = class WorldState {
      * @type {SteelPathOffering}
      */
     this.steelPath = new SteelPathOffering(deps);
+
+    [this.vaultTrader] = parseArray(deps.VoidTrader, data.PrimeVaultTraders, deps);
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warframe-worldstate-parser",
-  "version": "2.20.3",
+  "version": "2.22.0",
   "description": "An Open parser for Warframe's Worldstate in Javascript",
   "types": "./types/main.d.ts",
   "main": "main.js",
@@ -8,8 +8,10 @@
     "test": "test"
   },
   "dependencies": {
-    "node-fetch": "^2.6.1",
-    "warframe-worldstate-data": "^1.19.5"
+    "node-fetch": "^2.6.1"
+  },
+  "peerDependencies": {
+    "warframe-worldstate-data": ">=1.0"
   },
   "devDependencies": {
     "@types/chai": "^4.2.11",
@@ -18,15 +20,15 @@
     "@types/sinon-chai": "^3.2.5",
     "chai": "^4.2.0",
     "coveralls": "^3.1.0",
-    "eslint": "^7.20.0",
-    "eslint-config-airbnb-base": "^14.2.0",
+    "eslint": "^8.2.0",
+    "eslint-config-airbnb-base": "^15.0.0",
     "eslint-plugin-import": "^2.20.1",
     "greenkeeper-lockfile": "^1.15.1",
     "mocha": "^9.0.2",
     "nyc": "^15.1.0",
     "precommit-hook": "^3.0.0",
     "rewire": "^5.0.0",
-    "sinon": "^11.1.1",
+    "sinon": "^12.0.1",
     "sinon-chai": "^3.5.0",
     "typescript": "^4.0.5"
   },
@@ -131,5 +133,19 @@
       "text"
     ],
     "skip-full": true
+  },
+  "clean-package": {
+    "remove": [
+      "devDependencies",
+      "scripts",
+      "release",
+      "eslintIgnore",
+      "eslintConfig",
+      "pre-commit",
+      "nyc",
+      "mocha",
+      "clean-package",
+      "directories"
+    ]
   }
 }

package/types/lib/Alert.d.ts

@@ -13,7 +13,7 @@ declare class Alert extends WorldstateObject {
      * @param   {Reward}             Reward     The Reward parser
      * @param   {string}             locale     Locale to use for translations
      */
-    constructor(data: any, { mdConfig, translator, timeDate, Mission, Reward, locale, }: any);
+    constructor(data: any, { mdConfig, translator, timeDate, Mission, Reward, locale, }: MarkdownSettings);
     /**
      * The markdown settings
      * @type {MarkdownSettings}
@@ -24,7 +24,7 @@ declare class Alert extends WorldstateObject {
      * The mission that the players have to complete
      * @type {Mission}
      */
-    mission: any;
+    mission: MarkdownSettings;
     /**
      * ETA string (at time of object creation)
      * @type {String}
@@ -49,7 +49,7 @@ declare class Alert extends WorldstateObject {
      * Get the alert's reward
      * @returns {Reward}
      */
-    getReward(): any;
+    getReward(): Reward;
     /**
      * Get a string indicating how much time is left before the alert expires
      * @returns {string}

package/types/lib/CetusCycle.d.ts

@@ -11,8 +11,8 @@ declare class CetusCycle extends WorldstateObject {
      * @param   {TimeDateFunctions} deps.timeDate   The time and date functions
      */
     constructor(bountiesEndDate: Date, { mdConfig, timeDate }: {
-        mdConfig: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        timeDate: TimeDateFunctions;
     });
     /**
      * The markdown settings

package/types/lib/ChallengeInstance.d.ts

@@ -9,7 +9,7 @@ declare class ChallengeInstance {
      * @param   {Translator}         deps.translator The string translator
      * @param   {string}             deps.locale     Locale to use for translations
      */
-    constructor(data: any, { translator, locale }: any);
+    constructor(data: any, { translator, locale }: Dependency);
     /**
      * Type of challenge
      * @type {string}

package/types/lib/ConclaveChallenge.d.ts

@@ -13,9 +13,9 @@ declare class ConclaveChallenge extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/ConstructionProgress.d.ts

@@ -10,7 +10,7 @@ declare class ConstructionProgress extends WorldstateObject {
      * @param   {MarkdownSettings}   deps.mdConfig   The markdown settings
      */
     constructor(data: any, { mdConfig, timeDate }: {
-        mdConfig: any;
+        mdConfig: MarkdownSettings;
     });
     /**
      * The markdown settings

package/types/lib/DailyDeal.d.ts

@@ -12,9 +12,9 @@ declare class DailyDeal {
      * @param   {string}            deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/DarkSector.d.ts

@@ -16,12 +16,12 @@ declare class DarkSector extends WorldstateObject {
      * @param   {string}             deps.locale           Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, Mission, DarkSectorBattle, Reward, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
-        Mission: any;
-        DarkSectorBattle: any;
-        Reward: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
+        Mission: Mission;
+        DarkSectorBattle: DarkSectorBattle;
+        Reward: Reward;
         locale: string;
     });
     /**
@@ -96,7 +96,7 @@ declare class DarkSector extends WorldstateObject {
      * The dark sector's mission
      * @type {?Mission}
      */
-    mission: any;
+    mission: Mission;
     battlePayReserve: any;
     /**
      * The battle pay per mission offered to players
@@ -127,6 +127,6 @@ declare class DarkSector extends WorldstateObject {
      * The history of the dark sector
      * @type {Array.<DarkSectorBattle>}
      */
-    history: Array<any>;
+    history: Array<DarkSectorBattle>;
 }
 import WorldstateObject = require("./WorldstateObject");

package/types/lib/Fissure.d.ts

@@ -12,8 +12,8 @@ declare class Fissure extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { translator, timeDate, locale }: {
-        translator: any;
-        timeDate: any;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/FlashSale.d.ts

@@ -12,9 +12,9 @@ declare class FlashSale {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { translator, mdConfig, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/GlobalUpgrade.d.ts

@@ -12,9 +12,9 @@ declare class GlobalUpgrade {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { translator, timeDate, mdConfig, locale, }: {
-        translator: any;
-        timeDate: any;
-        mdConfig: any;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
+        mdConfig: MarkdownSettings;
         locale: string;
     });
     /**

package/types/lib/Invasion.d.ts

@@ -20,10 +20,10 @@ declare class Invasion extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, Reward, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
-        Reward: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
+        Reward: Reward;
         locale: string;
     });
     /**
@@ -51,7 +51,7 @@ declare class Invasion extends WorldstateObject {
      * The attacker's reward
      * @type {Reward}
      */
-    attackerReward: any;
+    attackerReward: Reward;
     /**
      * The attacking faction
      * @type {string}
@@ -66,7 +66,7 @@ declare class Invasion extends WorldstateObject {
      * The defender's reward
      * @type {Reward}
      */
-    defenderReward: any;
+    defenderReward: Reward;
     /**
      * The defending faction
      * @type {string}
@@ -76,7 +76,7 @@ declare class Invasion extends WorldstateObject {
      * Invasion defender
      * @type {Partipant}
      */
-    defender: any;
+    defender: Partipant;
     /**
      * Whether this invasion is against the infestation
      * @type {boolean}

package/types/lib/Mission.d.ts

@@ -12,9 +12,9 @@ declare class Mission {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, Reward, locale, }: {
-        mdConfig: any;
-        translator: any;
-        Reward: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        Reward: Reward;
         locale: string;
     });
     /**
@@ -47,7 +47,7 @@ declare class Mission {
      * The mission's reward
      * @type {?Reward}
      */
-    reward: any;
+    reward: Reward;
     /**
      * The minimum level of the enemies in the mission
      * @type {number}

package/types/lib/News.d.ts

@@ -11,7 +11,7 @@ declare class News extends WorldstateObject {
      * @param   {TimeDateFunctions}  deps.timeDate   The time and date functions
      * @param   {locale}             deps.locale     Locale to use for determining language
      */
-    constructor(data: any, { mdConfig, timeDate, locale }: any);
+    constructor(data: any, { mdConfig, timeDate, locale }: Dependency);
     /**
      * The markdown settings
      * @type {MarkdownSettings}

package/types/lib/Nightwave.d.ts

@@ -15,11 +15,11 @@ declare class Nightwave extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, Mission, Reward, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
-        Mission: any;
-        Reward: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
+        Mission: Mission;
+        Reward: Reward;
         locale: string;
     });
     /**

package/types/lib/NightwaveChallenge.d.ts

@@ -12,8 +12,8 @@ declare class NightwaveChallenge extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { translator, timeDate, locale, }: {
-        translator: any;
-        timeDate: any;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/PersistentEnemy.d.ts

@@ -12,8 +12,8 @@ declare class PersistentEnemy extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
         locale: string;
     });
     /**

package/types/lib/Reward.d.ts

@@ -10,7 +10,7 @@ declare class Reward {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { translator, locale }: {
-        translator: any;
+        translator: Translator;
         locale: string;
     });
     /**

package/types/lib/SentientOutpost.d.ts

@@ -20,7 +20,7 @@ export = SentientOutpost;
  * @property {Date}    previous.expiry     When the mission became or becomes inactive
  */
 declare class SentientOutpost {
-    constructor(data: string, { translator, locale, sentientData, logger, }: {
+    constructor(data: any, { translator, locale, sentientData, logger, }: {
         translator: any;
         locale: any;
         sentientData: any;

package/types/lib/Simaris.d.ts

@@ -11,8 +11,8 @@ declare class Simaris {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, locale }: {
-        mdConfig: any;
-        translator: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
         locale: string;
     });
     /**

package/types/lib/Sortie.d.ts

@@ -15,11 +15,11 @@ declare class Sortie extends WorldstateObject {
      * @param   {string}            deps.locale        Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, sortieData, SortieVariant, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         sortieData: any;
-        SortieVariant: any;
+        SortieVariant: SortieVariant;
         locale: string;
     });
     /**
@@ -37,7 +37,7 @@ declare class Sortie extends WorldstateObject {
      * The sortie's variants
      * @type {Array.<SortieVariant>}
      */
-    variants: Array<any>;
+    variants: Array<SortieVariant>;
     /**
      * The sortie's boss
      * @type {string}

package/types/lib/SortieVariant.d.ts

@@ -12,8 +12,8 @@ declare class SortieVariant {
      * @param   {string}            deps.locale        Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, locale, }: {
-        mdConfig: any;
-        translator: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
         sortieData: any;
         locale: string;
     });

package/types/lib/SyndicateJob.d.ts

@@ -12,7 +12,7 @@ declare class SyndicateJob extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, expiry: Date, { translator, timeDate, locale }: {
-        translator: any;
+        translator: Translator;
         locale: string;
     });
     /**

package/types/lib/SyndicateMission.d.ts

@@ -13,9 +13,9 @@ declare class SyndicateMission extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**

package/types/lib/VoidTrader.d.ts

@@ -13,9 +13,9 @@ declare class VoidTrader extends WorldstateObject {
      * @param   {string}             deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
         locale: string;
     });
     /**
@@ -50,6 +50,9 @@ declare class VoidTrader extends WorldstateObject {
      * @type {string}
      */
     endString: string;
+    initialStart: any;
+    completed: any;
+    schedule: any;
 }
 import WorldstateObject = require("./WorldstateObject");
 import VoidTraderItem = require("./VoidTraderItem");

package/types/lib/VoidTraderItem.d.ts

@@ -7,7 +7,7 @@ export = VoidTraderItem;
  */
 declare class VoidTraderItem {
     /**
-     * @param   {Object}             data            The challenge instance data
+     * @param   {Object}             data            The void trader item data
      * @param   {string}             data.ItemType   Worldstate Item i18n path
      * @param   {string}             data.PrimePrice Ducat cost of the item
      * @param   {string}             data.RegularPrice Credit price of the item
@@ -19,7 +19,7 @@ declare class VoidTraderItem {
         ItemType: string;
         PrimePrice: string;
         RegularPrice: string;
-    }, { translator, locale }: any);
+    }, { translator, locale }: Dependency);
     item: any;
     ducats: number;
     credits: number;

package/types/lib/VoidTraderSchedule.d.ts

@@ -0,0 +1,10 @@
+export = VoidTraderSchedule;
+declare class VoidTraderSchedule {
+    constructor(data: any, { timeDate, translator, locale }: {
+        timeDate: any;
+        translator: any;
+        locale: any;
+    });
+    expiry: any;
+    item: any;
+}

package/types/lib/WeeklyChallenge.d.ts

@@ -12,9 +12,9 @@ declare class WeeklyChallenge extends WorldstateObject {
      * @param   {TimeDateFunctions}  deps.timeDate   The time and date functions
      */
     constructor(data: any, { timeDate, translator }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
     });
     challenges: any;
 }

package/types/lib/WorldEvent.d.ts

@@ -10,7 +10,7 @@ export = WorldEvent;
  */
 /**
  * Progress for one of multiple stages
- * @typedef {Object} ProgessStep
+ * @typedef {Object} ProgressStep
  *
  * @property {string} type
  * @property {Number} progressAmt
@@ -31,10 +31,10 @@ declare class WorldEvent extends WorldstateObject {
      * @param   {string}            deps.locale     Locale to use for translations
      */
     constructor(data: any, { mdConfig, translator, timeDate, Reward, locale, }: {
-        mdConfig: any;
-        translator: any;
-        timeDate: any;
-        Reward: any;
+        mdConfig: MarkdownSettings;
+        translator: Translator;
+        timeDate: TimeDateFunctions;
+        Reward: Reward;
         locale: string;
     });
     /**
@@ -102,7 +102,7 @@ declare class WorldEvent extends WorldstateObject {
      * The event's rewards
      * @type {Reward[]}
      */
-    rewards: any[];
+    rewards: Reward[];
     /**
      * Whether or not this is expired (at time of object creation)
      * @type {boolean}
@@ -186,7 +186,7 @@ declare class WorldEvent extends WorldstateObject {
     getExpired(): boolean;
 }
 declare namespace WorldEvent {
-    export { InterimStep, ProgessStep };
+    export { InterimStep, ProgressStep };
 }
 import WorldstateObject = require("./WorldstateObject");
 /**
@@ -200,7 +200,7 @@ type InterimStep = {
     /**
      * Reward for reaching the step
      */
-    reward: any;
+    reward: Reward;
     /**
      * Amount of players at this step
      */
@@ -213,7 +213,7 @@ type InterimStep = {
 /**
  * Progress for one of multiple stages
  */
-type ProgessStep = {
+type ProgressStep = {
     type: string;
     progressAmt: number;
 };

package/types/lib/WorldState.d.ts

@@ -90,7 +90,7 @@ declare class WorldState {
      * Cambion Drift Cycle
      * @type {CambionCycle}
      */
-    cambionCycle: any;
+    cambionCycle: CambionCycle;
     /**
      * Weekly challenges
      * @type {Array.<WeeklyChallenge>}

package/types/lib/Dependency.d.ts

@@ -1,35 +0,0 @@
-export = Dependency;
-
-/**
- * Dependency Object
- */
-declare type Dependency = {
-    /**
-     * The markdown settings
-     */
-    mdConfig: import("./MarkdownSettings");
-    /**
-     * The string translator
-     */
-    translator: any;
-    /**
-     * The time and date functions
-     */
-    timeDate: any;
-    /**
-     * The Mission parser
-     */
-    Mission: import("./Mission.js");
-    /**
-     * The Reward parser
-     */
-    Reward: import("./Reward.js");
-    /**
-     * Locale to use for translations
-     */
-    locale: string;
-    /**
-     * Generic logger to use if needed
-     */
-    logger: object;
-};

package/types/lib/ExternalMission.d.ts

@@ -1,36 +0,0 @@
-export = ExternalMission;
-
-/**
- * External mission data retrieved from https://10o.io/kuvalog.json
- */
-declare type ExternalMission = {
-    /**
-     * start time
-     */
-    activation: Date;
-    /**
-     * end timer
-     */
-    expiry: Date;
-    /**
-     * formatted node name with planet
-     */
-    node: string;
-    /**
-     * Enemy on tile
-     */
-    enemy: string;
-    /**
-     * Mission type of node
-     */
-    type: string;
-    /**
-     * whether or not the tile requires archwing
-     */
-    archwing: boolean;
-    /**
-     * whether or not the tile requires
-    sumbersible archwing
-     */
-    sharkwing: boolean;
-};

package/types/lib/MarkdownSettings.d.ts

@@ -1,22 +0,0 @@
-export = MarkdownSettings;
-
-/**
- * A collection of strings that are used by the parser to produce markdown-formatted text
- */
-declare type MarkdownSettings = {
-  /**
-   * Line return character
-   */
-  lineEnd: String;
-  blockEnd: String;
-  doubleReturn: String;
-  linkBegin: String;
-  linkMid: String;
-  linkEnd: String;
-  bold: String;
-  italic: String;
-  underline: String;
-  strike: String;
-  codeLine: String;
-  codeBlock: String;
-};