warframe-worldstate-parser 2.26.2 → 2.28.0

package/lib/WorldState.js

@@ -2,39 +2,40 @@
 
 const sortieData = require('warframe-worldstate-data').sortie;
 
-const News = require('./News');
-const WorldEvent = require('./WorldEvent');
-const Alert = require('./Alert');
-const Sortie = require('./Sortie');
-const SortieVariant = require('./SortieVariant');
-const SyndicateMission = require('./SyndicateMission');
-const Fissure = require('./Fissure');
-const GlobalUpgrade = require('./GlobalUpgrade');
-const FlashSale = require('./FlashSale');
-const Invasion = require('./Invasion');
-const DarkSector = require('./DarkSector');
-const DarkSectorBattle = require('./DarkSectorBattle');
-const Mission = require('./Mission');
-const Reward = require('./Reward');
-const VoidTrader = require('./VoidTrader');
-const DailyDeal = require('./DailyDeal');
-const Simaris = require('./Simaris');
-const ConclaveChallenge = require('./ConclaveChallenge');
-const PersistentEnemy = require('./PersistentEnemy');
-const timeDate = require('./timeDate');
-const translator = require('./translation');
-const EarthCycle = require('./EarthCycle');
-const CetusCycle = require('./CetusCycle');
-const ConstructionProgress = require('./ConstructionProgress');
-const VallisCycle = require('./VallisCycle');
-const ZarimanCycle = require('./ZarimanCycle');
-const WeeklyChallenge = require('./WeeklyChallenge');
-const Nightwave = require('./Nightwave');
-const Kuva = require('./Kuva');
-const SentientOutpost = require('./SentientOutpost');
-const CambionCycle = require('./CambionCycle');
-const SteelPathOffering = require('./SteelPathOffering');
+const News = require('./models/News');
+const WorldEvent = require('./models/WorldEvent');
+const Alert = require('./models/Alert');
+const Sortie = require('./models/Sortie');
+const SortieVariant = require('./models/SortieVariant');
+const SyndicateMission = require('./models/SyndicateMission');
+const Fissure = require('./models/Fissure');
+const GlobalUpgrade = require('./models/GlobalUpgrade');
+const FlashSale = require('./models/FlashSale');
+const Invasion = require('./models/Invasion');
+const DarkSector = require('./models/DarkSector');
+const DarkSectorBattle = require('./models/DarkSectorBattle');
+const Mission = require('./models/Mission');
+const Reward = require('./models/Reward');
+const VoidTrader = require('./models/VoidTrader');
+const DailyDeal = require('./models/DailyDeal');
+const Simaris = require('./models/Simaris');
+const ConclaveChallenge = require('./models/ConclaveChallenge');
+const PersistentEnemy = require('./models/PersistentEnemy');
+const timeDate = require('./utilities/timeDate');
+const translator = require('./utilities/translation');
+const EarthCycle = require('./models/EarthCycle');
+const CetusCycle = require('./models/CetusCycle');
+const ConstructionProgress = require('./models/ConstructionProgress');
+const VallisCycle = require('./models/VallisCycle');
+const ZarimanCycle = require('./models/ZarimanCycle');
+const WeeklyChallenge = require('./models/WeeklyChallenge');
+const Nightwave = require('./models/Nightwave');
+const Kuva = require('./models/Kuva');
+const SentientOutpost = require('./models/SentientOutpost');
+const CambionCycle = require('./models/CambionCycle');
+const SteelPathOffering = require('./models/SteelPathOffering');
 const Dependency = require('./supporting/Dependency'); // eslint-disable-line no-unused-vars
+const DuviriCycle = require('./models/DuviriCycle');
 
 // needed for type declarations
 const MarkdownSettings = require('./supporting/MarkdownSettings');
@@ -328,5 +329,7 @@ module.exports = class WorldState {
      * @type {Sortie}
      */
     [this.archonHunt] = parseArray(deps.Sortie, data.LiteSorties, deps);
+
+    this.duviriCycle = new DuviriCycle(deps);
   }
 };

package/lib/{CetusCycle.js → models/CetusCycle.js}

@@ -68,7 +68,7 @@ class CetusCycle extends WorldstateObject {
     this.activation = new Date(ec.start);
 
     /**
-     * Whether or not this it's daytime
+     * Whether it's daytime
      * @type {boolean}
      */
     this.isDay = ec.dayTime;
@@ -86,7 +86,7 @@ class CetusCycle extends WorldstateObject {
     this.timeLeft = ec.timeLeft;
 
     /**
-     * Whether or not this is for Cetus Cycle
+     * Whether this is for Cetus Cycle
      * @type {boolean}
      */
     this.isCetus = true;

package/lib/{DailyDeal.js → models/DailyDeal.js}

@@ -35,6 +35,12 @@ class DailyDeal {
      */
     this.item = translator.languageString(data.StoreItem, locale);
 
+    /**
+     * The uniqueName for the item on sale.
+     * @type {string}
+     */
+    this.uniqueName = data.StoreItem;
+
     /**
      * The date and time at which the deal will expire
      * @type {Date}

package/lib/models/DuviriCycle.js

@@ -0,0 +1,59 @@
+'use strict';
+
+const WorldstateObject = require('./WorldstateObject');
+
+const cycleTime = 36000;
+const stateTime = 7200;
+
+const states = ['sorrow', 'fear', 'joy', 'anger', 'envy'];
+
+const getStageInfo = () => {
+  const cycleDelta = (Math.floor(Date.now() / 1000) - 52) % cycleTime;
+  const stateInd = Math.floor(cycleDelta / stateTime);
+  const stateDelta = cycleDelta % stateTime;
+  const untilNext = stateTime - stateDelta;
+  const expiry = new Date(Date.now() + untilNext * 1000);
+  const activation = new Date(expiry.getTime() - stateTime * 1000);
+  return {
+    state: states[stateInd],
+    expiry,
+    activation,
+  };
+};
+
+/**
+ * @typedef {WorldstateObject} DuviriCycle
+ * @extends {WorldstateObject}
+ */
+class DuviriCycle extends WorldstateObject {
+  constructor({ timeDate, translator }) {
+    super({ _id: { $oid: 'duviriCycle0' } }, { timeDate, translator });
+    const { activation, expiry, state } = getStageInfo();
+
+    /**
+     * When the cycle start(s/ed)
+     * @type {Date}
+     */
+    this.activation = activation;
+    /**
+     * When the cycle end(s/ed)
+     * @type {Date}
+     */
+    this.expiry = expiry;
+    /**
+     * Current stage key
+     * @type {string}
+     */
+    this.state = state;
+
+    this.id = `duviriCycle${this.state}${this.expiry.getTime()}`;
+  }
+
+  toString() {
+    return `${this.translator.toTitleCase(this.state)} spiral. ${this.translator.toTitleCase(
+      states[(states.indexOf(this.state) + 1) % 5]
+    )} in ${this.timeDate.timeDeltaToString(new Date(this.expiry).getTime() - Date.now())}`;
+  }
+}
+
+module.exports = DuviriCycle;

package/lib/models/Reward.js

@@ -0,0 +1,113 @@
+'use strict';
+
+const rewardTypes = require('../supporting/RewardTypes');
+
+/**
+ * An object describing a type of reward, including name, description,
+ * test function to verify type from a string, thumbnail url, and color
+ * @typedef {Object} RewardType
+ * @property {string} name          - Name of the reward type
+ * @property {string} description   - Description of the reward type
+ * @property {string} test          - Function for testing the return type against a string
+ * @property {string} thumbnail     - Thumbnail url for this reward type
+ * @property {string} color         - Summary color representing this reward type
+ */
+
+/**
+ * Returns the type of a given item
+ * @param   {string}          item The item whose type needs to be determined
+ * @param   {Array.<RewardType>}  [types] The possible types
+ * @returns {string}          The type name
+ */
+function getItemType(item, types = rewardTypes) {
+  return types.find((t) => t.test(item)).name;
+}
+
+/**
+ * Returns the full type of a given item
+ * @param   {string}          item The item whose type needs to be determined
+ * @param   {Array.<RewardType>}  [types] The possible types
+ * @returns {RewardType}      The type
+ */
+function getItemTypeFull(item, types = rewardTypes) {
+  return types.find((t) => t.test(item));
+}
+
+/**
+ * Represents a mission reward
+ */
+class Reward {
+  /**
+   * @param   {Object} data                 The mission data
+   * @param   {Object}             deps            The dependencies object
+   * @param   {Translator}         deps.translator The string translator
+   * @param   {string}             deps.locale     Locale to use for translations
+   */
+  constructor(data, { translator, locale }) {
+    /**
+     * The items being rewarded
+     * @type {Array.<string>}
+     */
+    this.items = data.items ? data.items.map((i) => translator.languageString(i), locale) : [];
+
+    /**
+     * The counted items being rewarded
+     * @type {Array.<Object>}
+     */
+    this.countedItems = data.countedItems
+      ? data.countedItems.map((i) => ({
+          count: i.ItemCount,
+          type: translator.languageString(i.ItemType, locale),
+          key: translator.languageString(i.ItemType),
+        }))
+      : [];
+
+    /**
+     * The credits being rewarded
+     * @type {number}
+     */
+    this.credits = data.credits || 0;
+
+    this.asString = this.toString();
+
+    this.itemString = this.items
+      .concat(this.countedItems.map((i) => `${i.count > 1 ? i.count : ''} ${i.type}`.trim()))
+      .join(' + ');
+
+    this.thumbnail = this.getTypesFull()[0] ? this.getTypesFull()[0].thumbnail : 'https://i.imgur.com/JCKyUXJ.png';
+
+    this.color = this.getTypesFull()[0] ? this.getTypesFull()[0].color : 0xf1c40f;
+  }
+
+  /**
+   * The types of all items that are being rewarded
+   * @returns {Array.<string>}
+   */
+  getTypes() {
+    return this.items.concat(this.countedItems.map((i) => i.key)).map((t) => getItemType(t));
+  }
+
+  /**
+   * The types of all the items that are being rewarded
+   * @returns {Array.<RewardType>}
+   */
+  getTypesFull() {
+    return this.items.concat(this.countedItems.map((i) => i.key)).map((t) => getItemTypeFull(t));
+  }
+
+  /**
+   * The reward's string representation
+   * @returns {string}
+   */
+  toString() {
+    const tokens = this.items.concat(this.countedItems.map((i) => `${i.count > 1 ? i.count : ''} ${i.type}`.trim()));
+
+    if (this.credits) {
+      tokens.push(`${this.credits}cr`);
+    }
+
+    return tokens.join(' + ');
+  }
+}
+
+module.exports = Reward;

package/lib/{WorldstateObject.js → models/WorldstateObject.js}

@@ -31,8 +31,9 @@ module.exports = class WorldstateObject {
   /**
    * @param   {BaseContentObject} data The object data
    * @param   {TimeDateFunctions} timeDate time date functions
+   * @param   {Translator} translator translation functions
    */
-  constructor(data, { timeDate }) {
+  constructor(data, { timeDate, translator }) {
     /**
      * The object's id field
      * @type {Identifier.$id|Identifier.$oid}
@@ -48,6 +49,9 @@ module.exports = class WorldstateObject {
     this.timeDate = timeDate;
     Object.defineProperty(this, 'timeDate', { enumerable: false, configurable: false });
 
+    this.translator = translator || require('../utilities/translation');
+    Object.defineProperty(this, 'translator', { enumerable: false, configurable: false });
+
     if (data.Activation) {
       /**
        * The date and time at which the void trader arrives

package/lib/supporting/RewardData.js

@@ -0,0 +1,79 @@
+'use strict';
+
+const resources = [
+  'Alloy Plate',
+  'Argon Crystal',
+  'Circuits',
+  'Control Module',
+  'Cryotic',
+  'Ferrite',
+  'Gallium',
+  'Morphics',
+  'Nano Spores',
+  'Neural Sensors',
+  'Neurodes',
+  'Orokin Cell',
+  'Oxium',
+  'Plastids',
+  'Polymer Bundle',
+  'Rubedo',
+  'Salvage',
+  'Tellurium',
+];
+
+// Aura names
+const auras = [
+  'Brief Respite',
+  'Corrosive Projection',
+  'Dead Eye',
+  'EMP Aura',
+  'Empowered Blades',
+  'Enemy Radar',
+  'Energy Siphon',
+  'Growing Power',
+  'Infested Impedance',
+  'Loot Detector',
+  'Physique',
+  'Pistol Amp',
+  'Pistol Scavenger',
+  'Rejuvenation',
+  'Rifle Amp',
+  'Rifle Scavenger',
+  'Shield Disruption',
+  'Shotgun Amp',
+  'Shotgun Scavenger',
+  'Sniper Scavenger',
+  'Speed Holster',
+  'Sprint Boost',
+  'Stand United',
+  'Steel Charge',
+];
+
+// Nightmare mod names
+const nightmare = [
+  'Accelerated Blast',
+  'Animal Instinct',
+  'Armored Agility',
+  'Blaze',
+  'Chilling Reload',
+  'Constitution',
+  'Drifting Contact',
+  'Focus Energy',
+  'Fortitude',
+  'Hammer Shot',
+  'Ice Storm',
+  'Lethal Torrent',
+  'Rending Strike',
+  'Stunning Speed',
+  'Wildfire',
+  'Seeking Fury',
+  'Streamlined Form',
+  'Shred',
+  'Vigor',
+];
+
+module.exports = {
+  nightmare,
+  auras,
+  resources,
+};

package/lib/{Reward.js → supporting/RewardTypes.js}

@@ -1,94 +1,12 @@
 'use strict';
 
-// Resource names
-const resources = [
-  'Alloy Plate',
-  'Argon Crystal',
-  'Circuits',
-  'Control Module',
-  'Cryotic',
-  'Ferrite',
-  'Gallium',
-  'Morphics',
-  'Nano Spores',
-  'Neural Sensors',
-  'Neurodes',
-  'Orokin Cell',
-  'Oxium',
-  'Plastids',
-  'Polymer Bundle',
-  'Rubedo',
-  'Salvage',
-  'Tellurium',
-];
-
-// Aura names
-const auras = [
-  'Brief Respite',
-  'Corrosive Projection',
-  'Dead Eye',
-  'EMP Aura',
-  'Empowered Blades',
-  'Enemy Radar',
-  'Energy Siphon',
-  'Growing Power',
-  'Infested Impedance',
-  'Loot Detector',
-  'Physique',
-  'Pistol Amp',
-  'Pistol Scavenger',
-  'Rejuvenation',
-  'Rifle Amp',
-  'Rifle Scavenger',
-  'Shield Disruption',
-  'Shotgun Amp',
-  'Shotgun Scavenger',
-  'Sniper Scavenger',
-  'Speed Holster',
-  'Sprint Boost',
-  'Stand United',
-  'Steel Charge',
-];
-
-// Nightmare mod names
-const nightmare = [
-  'Accelerated Blast',
-  'Animal Instinct',
-  'Armored Agility',
-  'Blaze',
-  'Chilling Reload',
-  'Constitution',
-  'Drifting Contact',
-  'Focus Energy',
-  'Fortitude',
-  'Hammer Shot',
-  'Ice Storm',
-  'Lethal Torrent',
-  'Rending Strike',
-  'Stunning Speed',
-  'Wildfire',
-  'Seeking Fury',
-  'Streamlined Form',
-  'Shred',
-  'Vigor',
-];
-
-/**
- * An object describing a type of reward, including name, description,
- * test function to verify type from a string, thumbnail url, and color
- * @typedef {Object} RewardType
- * @property {string} name          - Name of the reward type
- * @property {string} description   - Description of the reward type
- * @property {string} test          - Function for testing the return type against a string
- * @property {string} thumbnail     - Thumbnail url for this reward type
- * @property {string} color         - Summary color representing this reward type
- */
+const { auras, nightmare, resources } = require('./RewardData');
 
 /**
  * All possible RewardTypes
  * @type {Array.<RewardType>}
  */
-const rewardTypes = [
+module.exports = [
   {
     name: 'vauban',
     description: 'Vauban parts',
@@ -410,102 +328,3 @@ const rewardTypes = [
     color: 0x4f545c,
   },
 ];
-
-/**
- * Returns the type of a given item
- * @param   {string}          item The item whose type needs to be determined
- * @param   {Array.<RewardType>}  [types] The possible types
- * @returns {string}          The type name
- */
-function getItemType(item, types = rewardTypes) {
-  return types.find((t) => t.test(item)).name;
-}
-
-/**
- * Returns the full type of a given item
- * @param   {string}          item The item whose type needs to be determined
- * @param   {Array.<RewardType>}  [types] The possible types
- * @returns {RewardType}      The type
- */
-function getItemTypeFull(item, types = rewardTypes) {
-  return types.find((t) => t.test(item));
-}
-
-/**
- * Represents a mission reward
- */
-class Reward {
-  /**
-   * @param   {Object} data                 The mission data
-   * @param   {Object}             deps            The dependencies object
-   * @param   {Translator}         deps.translator The string translator
-   * @param   {string}             deps.locale     Locale to use for translations
-   */
-  constructor(data, { translator, locale }) {
-    /**
-     * The items being rewarded
-     * @type {Array.<string>}
-     */
-    this.items = data.items ? data.items.map((i) => translator.languageString(i), locale) : [];
-
-    /**
-     * The counted items being rewarded
-     * @type {Array.<Object>}
-     */
-    this.countedItems = data.countedItems
-      ? data.countedItems.map((i) => ({
-          count: i.ItemCount,
-          type: translator.languageString(i.ItemType, locale),
-          key: translator.languageString(i.ItemType),
-        }))
-      : [];
-
-    /**
-     * The credits being rewarded
-     * @type {number}
-     */
-    this.credits = data.credits || 0;
-
-    this.asString = this.toString();
-
-    this.itemString = this.items
-      .concat(this.countedItems.map((i) => `${i.count > 1 ? i.count : ''} ${i.type}`.trim()))
-      .join(' + ');
-
-    this.thumbnail = this.getTypesFull()[0] ? this.getTypesFull()[0].thumbnail : 'https://i.imgur.com/JCKyUXJ.png';
-
-    this.color = this.getTypesFull()[0] ? this.getTypesFull()[0].color : 0xf1c40f;
-  }
-
-  /**
-   * The types of all items that are being rewarded
-   * @returns {Array.<string>}
-   */
-  getTypes() {
-    return this.items.concat(this.countedItems.map((i) => i.key)).map((t) => getItemType(t));
-  }
-
-  /**
-   * The types of all the items that are being rewarded
-   * @returns {Array.<RewardType>}
-   */
-  getTypesFull() {
-    return this.items.concat(this.countedItems.map((i) => i.key)).map((t) => getItemTypeFull(t));
-  }
-
-  /**
-   * The reward's string representation
-   * @returns {string}
-   */
-  toString() {
-    const tokens = this.items.concat(this.countedItems.map((i) => `${i.count > 1 ? i.count : ''} ${i.type}`.trim()));
-
-    if (this.credits) {
-      tokens.push(`${this.credits}cr`);
-    }
-
-    return tokens.join(' + ');
-  }
-}
-
-module.exports = Reward;

package/lib/{translation.js → utilities/translation.js}

@@ -204,10 +204,10 @@ function steelPath(dataOverride) {
 
 /**
  * An object containing functions to convert in-game names to their localizations
- * @typedef {Object.<function>} Translator
+ * @typedef {Record<string, function>} Translator
  * @property {function} faction          - Converts faction names
  * @property {function} node             - Converts star map node names
- * @property {function} nodeMissionType  - Returns the mission type of a given node
+ * @property {function} nodeMissionType  - Returns the mission type of given node
  * @property {function} nodeEnemy        - Returns the faction that controls a given node
  * @property {function} languageString   - Converts generic language strings
  * @property {function} languageDesc     - Converts generic language strings
@@ -225,6 +225,7 @@ function steelPath(dataOverride) {
  * @property {function} region           - Converts persistent enemy region indicies
  * @property {function} conclaveChallenge - Convert conclave identifiers into standing data
  * @property {function} steelPath        -  Retrieve Steel Path rotation data for locale
+ * @property {function} toTitleCase      - Format provided string as titlecase
  */
 module.exports = {
   faction,
@@ -249,4 +250,5 @@ module.exports = {
   region,
   conclaveChallenge,
   steelPath,
+  toTitleCase,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "warframe-worldstate-parser",
-  "version": "2.26.2",
+  "version": "2.28.0",
   "description": "An Open parser for Warframe's Worldstate in Javascript",
   "types": "./types/main.d.ts",
   "main": "main.js",

package/types/lib/WorldState.d.ts

@@ -127,28 +127,30 @@ declare class WorldState {
      * @type {SteelPathOffering}
      */
     steelPath: SteelPathOffering;
+    duviriCycle: DuviriCycle;
 }
-import News = require("./News");
-import WorldEvent = require("./WorldEvent");
-import Alert = require("./Alert");
-import SyndicateMission = require("./SyndicateMission");
-import Fissure = require("./Fissure");
-import GlobalUpgrade = require("./GlobalUpgrade");
-import FlashSale = require("./FlashSale");
-import Invasion = require("./Invasion");
-import DarkSector = require("./DarkSector");
-import DailyDeal = require("./DailyDeal");
-import Simaris = require("./Simaris");
-import ConclaveChallenge = require("./ConclaveChallenge");
-import PersistentEnemy = require("./PersistentEnemy");
-import EarthCycle = require("./EarthCycle");
-import CetusCycle = require("./CetusCycle");
-import CambionCycle = require("./CambionCycle");
-import ZarimanCycle = require("./ZarimanCycle");
-import WeeklyChallenge = require("./WeeklyChallenge");
-import ConstructionProgress = require("./ConstructionProgress");
-import VallisCycle = require("./VallisCycle");
-import Nightwave = require("./Nightwave");
-import SentientOutpost = require("./SentientOutpost");
-import SteelPathOffering = require("./SteelPathOffering");
+import News = require("./models/News");
+import WorldEvent = require("./models/WorldEvent");
+import Alert = require("./models/Alert");
+import SyndicateMission = require("./models/SyndicateMission");
+import Fissure = require("./models/Fissure");
+import GlobalUpgrade = require("./models/GlobalUpgrade");
+import FlashSale = require("./models/FlashSale");
+import Invasion = require("./models/Invasion");
+import DarkSector = require("./models/DarkSector");
+import DailyDeal = require("./models/DailyDeal");
+import Simaris = require("./models/Simaris");
+import ConclaveChallenge = require("./models/ConclaveChallenge");
+import PersistentEnemy = require("./models/PersistentEnemy");
+import EarthCycle = require("./models/EarthCycle");
+import CetusCycle = require("./models/CetusCycle");
+import CambionCycle = require("./models/CambionCycle");
+import ZarimanCycle = require("./models/ZarimanCycle");
+import WeeklyChallenge = require("./models/WeeklyChallenge");
+import ConstructionProgress = require("./models/ConstructionProgress");
+import VallisCycle = require("./models/VallisCycle");
+import Nightwave = require("./models/Nightwave");
+import SentientOutpost = require("./models/SentientOutpost");
+import SteelPathOffering = require("./models/SteelPathOffering");
+import DuviriCycle = require("./models/DuviriCycle");
 import Dependency = require("./supporting/Dependency");

package/types/lib/{CetusCycle.d.ts → models/CetusCycle.d.ts}

@@ -27,7 +27,7 @@ declare class CetusCycle extends WorldstateObject {
      */
     private bountiesEndDate;
     /**
-     * Whether or not this it's daytime
+     * Whether it's daytime
      * @type {boolean}
      */
     isDay: boolean;
@@ -42,7 +42,7 @@ declare class CetusCycle extends WorldstateObject {
      */
     timeLeft: string;
     /**
-     * Whether or not this is for Cetus Cycle
+     * Whether this is for Cetus Cycle
      * @type {boolean}
      */
     isCetus: boolean;

package/types/lib/{DailyDeal.d.ts → models/DailyDeal.d.ts}

@@ -34,6 +34,11 @@ declare class DailyDeal {
      * @type {string}
      */
     item: string;
+    /**
+     * The uniqueName for the item on sale.
+     * @type {string}
+     */
+    uniqueName: string;
     /**
      * The date and time at which the deal will expire
      * @type {Date}

package/types/lib/models/DuviriCycle.d.ts

@@ -0,0 +1,22 @@
+export = DuviriCycle;
+/**
+ * @typedef {WorldstateObject} DuviriCycle
+ * @extends {WorldstateObject}
+ */
+declare class DuviriCycle extends WorldstateObject {
+    constructor({ timeDate, translator }: {
+        timeDate: any;
+        translator: any;
+    });
+    /**
+     * Current stage key
+     * @type {string}
+     */
+    state: string;
+    id: string;
+}
+declare namespace DuviriCycle {
+    export { DuviriCycle };
+}
+import WorldstateObject = require("./WorldstateObject");
+type DuviriCycle = WorldstateObject;

package/types/lib/{NightwaveChallenge.d.ts → models/NightwaveChallenge.d.ts}

@@ -36,12 +36,6 @@ declare class NightwaveChallenge extends WorldstateObject {
      * @type {string}
      */
     title: string;
-    /**
-     * Generated id from expiry, challenge string,
-     *  and whether or not it has `[PH]` (designating placeholder text)
-     * @type {string}
-     */
-    id: string;
     /**
      * Reputation reward for ranking up in the Nightwave
      * @type {Number}

package/types/lib/{SyndicateMission.d.ts → models/SyndicateMission.d.ts}

@@ -24,12 +24,6 @@ declare class SyndicateMission extends WorldstateObject {
      * @private
      */
     private mdConfig;
-    /**
-     * The translation functions
-     * @type {Translator}
-     * @private
-     */
-    private translator;
     /**
      * The syndicate that is offering the mission
      * @type {string}
@@ -50,11 +44,6 @@ declare class SyndicateMission extends WorldstateObject {
      * @type {Array.<SyndicateJob>}
      */
     jobs: Array<SyndicateJob>;
-    /**
-     * Unique identifier for this mission set built from the end time and syndicate
-     * @type {string}
-     */
-    id: string;
     /**
      * ETA string (at time of object creation)
      * @type {String}

package/types/lib/{WorldstateObject.d.ts → models/WorldstateObject.d.ts}

@@ -3,8 +3,9 @@ declare class WorldstateObject {
     /**
      * @param   {BaseContentObject} data The object data
      * @param   {TimeDateFunctions} timeDate time date functions
+     * @param   {Translator} translator translation functions
      */
-    constructor(data: BaseContentObject, { timeDate }: TimeDateFunctions);
+    constructor(data: BaseContentObject, { timeDate, translator }: TimeDateFunctions);
     /**
      * The object's id field
      * @type {Identifier.$id|Identifier.$oid}
@@ -16,6 +17,7 @@ declare class WorldstateObject {
      * @private
      */
     private timeDate;
+    translator: any;
     /**
      * The date and time at which the void trader arrives
      * @type {Date}

package/types/lib/supporting/RewardData.d.ts

@@ -0,0 +1,3 @@
+export const nightmare: string[];
+export const auras: string[];
+export const resources: string[];

package/types/lib/supporting/RewardTypes.d.ts

@@ -0,0 +1,2 @@
+declare const _exports: Array<RewardType>;
+export = _exports;

package/types/lib/{translation.d.ts → utilities/translation.d.ts}

@@ -1,7 +1,7 @@
 /**
  * An object containing functions to convert in-game names to their localizations
  */
-export type Translator = any;
+export type Translator = Record<string, Function>;
 export function faction(key: any, dataOverride: any): any;
 export function node(key: any, dataOverride: any): any;
 export function nodeMissionType(key: any, dataOverride: any): any;
@@ -24,3 +24,4 @@ export function sortieFaction(key: any, dataOverride: any): any;
 export function region(key: any, dataOverride: any): any;
 export function conclaveChallenge(key: any, dataOverride: any): any;
 export function steelPath(dataOverride: any): any;
+export function toTitleCase(str: any): any;