From d6923dede476dca67c15c584ff5097ef3a5232ec Mon Sep 17 00:00:00 2001
From: Konstantin Kitmanov <konstantin.kitmanov@fabres.pl>
Date: Thu, 3 Aug 2017 16:42:02 +0200
Subject: [PATCH] Improve typings: add missing methods, less generic types,
 some docs

---
 typings/salet/index.d.ts | 194 +++++++++++++++++++++++++++++++--------
 1 file changed, 154 insertions(+), 40 deletions(-)

diff --git a/typings/salet/index.d.ts b/typings/salet/index.d.ts
index 259759f..8050acb 100644
--- a/typings/salet/index.d.ts
+++ b/typings/salet/index.d.ts
@@ -7,6 +7,8 @@ type TRoomTag = string;
 type TActionName = string;
 type TTimerName = string;
 type TLink = TRoomName | TActionName | string;
+type EpochTime = number;
+
 
 interface Random {
     modulo: number;
@@ -23,31 +25,102 @@ interface Random {
     getSeed(): number;
 }
 
-interface Salet {
+
+interface SaletProgressSequence {
+    link: TLink;
+    time: EpochTime;
+}
+
+interface SaletProgress {
+    seed: number;
+    sequence: SaletProgressSequence[];
+    path: TRoomName[];
+    saveTime: EpochTime;
+}
+
+
+interface SaletRooms {
+    [roomName: string]: SaletRoom
+}
+
+
+interface Timer {
+    step: number;
+    repeatable: boolean;
+    action: TActionName
+    set: number;
+}
+
+interface Timers {
+    [timerName: string]: Timer;
+}
+
+interface SaletTimers {
+    timers: Timers;
+
+    /**
+     * Adds a one-time timer `name` that will fire after `steps` clicks with `action`
+     * @param name
+     * @param action
+     * @param [repeat=false]
+     * @param [step=1]
+     */
+    addTimer(name: TTimerName, action: TStringLike, repeat: boolean, step: number): void;
+
+    dropTimer(name: TTimerName): void;
+
+    resetTimer(name: TTimerName): void;
+
+    /** system handler, called every turn */
+    checkTimer(): void;
+}
+
+
+interface SaletSaveLoad {
+    autosave: boolean;
+    autoload: boolean;
+
+    /**
+     * If `force` is false, shows prompt if user sure to erase save.
+     * Silently erases save otherwise
+     * @param [force = false]
+     */
+    eraseSave(force: boolean): void;
+
+    saveGame(): void;
+
+    loadGame(saveData: object): void;
+
+    getSaveId(): string;
+
+    getSave(): object;
+}
+
+
+interface Salet extends SaletTimers, SaletSaveLoad {
     character: Character;
     game_id: string;
     game_version: string;
-    autosave: boolean;
     rnd: Random;
-    time: number;
-    /** epoch */
-    startTime: number;
+    time: EpochTime;
+    startTime: EpochTime;
     linkRe: RegExp;
     current: TRoomName;
     interactive: boolean;
     linkStack: TLink[];
-    progress: any; // TODO
+    progress: SaletProgress;
     view: SaletView;
     start: TRoomName;
-    rooms: any; // TODO
-    timers: any; // TODO
+    rooms: SaletRooms;
 
-    init() : void;
+    init(): void;
 
     enter(from: TRoomName, to: TRoomName): void;
+
     afterEnter(from: TRoomName, to: TRoomName): void;
 
     beforeAction(name: TRoomName, action: TActionName): boolean | void;
+
     afterAction(name: TRoomName, action: TActionName): boolean | void;
 
     exit(from: TRoomName, to: TRoomName): void;
@@ -60,19 +133,21 @@ interface Salet {
     getSituationIdChoices(tag: TRoomTag, length: number): SaletRoom[];
 
     getCurrentRoom(): SaletRoom;
+
     /** synonym for getCurrentRoom */
     here(): SaletRoom;
 
-    getSaveId(): string;
-
-    /**
-     * Saves click timestamp, adds turn to history
-     */
+    /** Saves click timestamp, adds turn to history */
     processClick(link: TLink): void;
+
+    /** synonym for `processClick` */
+    goTo(id: TRoomName): void;
+
     /**
      * Adds link to execution stack, calls processOneLink, scrolls to new text
      */
     processLink(link: TLink): void;
+
     /**
      * Executes transition
      */
@@ -84,6 +159,7 @@ interface Salet {
      * @param [n=2]
      */
     goBack(n: number): void;
+
     /**
      *
      * @param id
@@ -91,56 +167,36 @@ interface Salet {
      */
     doTransitionTo(id: TRoomName, force: boolean): void;
 
-    /**
-     * If `force` is false, shows prompt if user sure to erase save.
-     * Silently erases save otherwise
-     * @param [force = false]
-     */
-    eraseSave(force: boolean): void;
-
     getRoomsTagged(tag: TRoomTag): SaletRoom[];
 
-    saveGame(): void;
-    loadGame(saveData: any): void;
-
     /**
      * Initializes Salet and starts game. Calls `init` and loads game if there's save and `autoload`
      * is true.
      */
     beginGame(): void;
 
-    /** synonym for `processClick` */
-    goTo(id: TRoomName): void;
-    // TODO
 
     isVisited(name: TRoomName): boolean;
-
-    /**
-     *
-     * @param name
-     * @param action
-     * @param [repeat=false]
-     * @param [step=1]
-     */
-    addTimer(name: TTimerName, action: TStringLike, repeat: boolean, step: number): void;
-    dropTimer(name: TTimerName): void;
-    resetTimer(name: TTimerName): void;
-    /** system handler, called every turn */
-    checkTimer(): void;
 }
 
+
 interface Character {
     inventory: SaletUnit[];
 
     take(unit: SaletUnit): void;
+
     drop(unitName: TUnitName): boolean;
+
     has(unitName: TUnitName): boolean;
+
     /** Executes `inv` of that unit */
     inv(unitName: TUnitName): void;
+
     /** Generates unit href */
     listinv(unitName: TUnitName): string;
 }
 
+
 interface SaletUnitProps {
     name: TUnitName;
 
@@ -157,6 +213,7 @@ interface SaletUnitProps {
 
 interface SaletUnit extends SaletUnitProps {
     put(location: TRoomName): void;
+
     /**
      *
      * @param [location='@location']
@@ -164,6 +221,7 @@ interface SaletUnit extends SaletUnitProps {
     delete(location: TRoomName): void;
 }
 
+
 interface SaletRoomProps {
     name: TRoomName;
 
@@ -190,21 +248,30 @@ interface SaletRoom extends SaletRoomProps {
     canExit(id: TRoomName): boolean;
 
     exit(to: TRoomName): void;
+
     enter(from: TRoomName): void;
+
     /**
      *
      * @param from
      * @param [forceExit=true]
      */
     entering(from: TRoomName, forceExit?: boolean): void;
+
     take(unit: SaletUnit): void;
+
     drop(unit: SaletUnit): void;
+
     act(linkTarget: TLink): void;
+
     register(): void;
+
     link(id: TRoomName): void;
+
     bilink(id: TRoomName): void;
 }
 
+
 interface SaletView {
     init(): void;
 
@@ -250,6 +317,53 @@ interface SaletView {
      * @param [selector='#content']
      */
     replace(content: any, selector: string): void;
+
+    /**
+     * @param {string} [address] if given, clears all link leading to this
+     * @param {string} [selector='#content']
+     */
+    clearLinks(address?: string, selector?: string): void;
+
+    /**
+     * Given a list of room ids, this outputs a standard option block with the room choices in the
+     * given order.
+     * The contents of each choice will be a link to the room, the text of the link will be given by
+     * the room's outputText property. Note that the canChoose function is called, and if it returns
+     * false, then the text will appear, but the link will not be clickable.
+     *
+     * Although canChoose is honored, canView and displayOrder are not. If you need to honor these,
+     * you should either do so manually, ot else use the `getSituationIdChoices` method to return
+     * an ordered list of valid viewable room ids.
+     */
+    writeChoices(rooms: TRoomName[]): void;
+
+    /**
+     * Shows block with animation (can be redefined). Animation is skipped if Salet is in non-interactive mode
+     */
+    showBlock(selector: string): void;
+
+    /**
+     * Hides block with animation (can be redefined). Animation is skipped if Salet is in non-interactive mode.
+     * If `remove` is true, block will be deleted from DOM, otherwise, just hidden
+     */
+    showBlock(selector: string, remove?: boolean): void;
+
+    /**
+     * Returns HTML-string for cycling link
+     */
+    cycleLink(content: string): string;
+
+    endOutputTransaction(): void;
+
+    hasLocalStorage(): boolean;
+
+    fixClicks(): void;
+
+    mark_all_links_old(): void;
+
+    removeTransient(room?: TRoomName): void;
+
+    updateWays(ways?: TRoomName[], name?: TRoomName): void;
 }