From 810f3a87b900ac4d529aa386db22f3fd4e345ce3 Mon Sep 17 00:00:00 2001 From: Olivier Gagnon Date: Tue, 19 Jul 2022 21:53:43 -0400 Subject: [PATCH] rm more anys --- src/PersonObjects/Player/PlayerObject.ts | 2 +- src/Server/data/servers.ts | 2 -- src/Terminal/commands/download.ts | 2 +- src/Terminal/commands/ls.tsx | 19 +++++++++---------- src/Terminal/commands/wget.ts | 6 +++--- 5 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/PersonObjects/Player/PlayerObject.ts b/src/PersonObjects/Player/PlayerObject.ts index 89cd92702..3c32ccf75 100644 --- a/src/PersonObjects/Player/PlayerObject.ts +++ b/src/PersonObjects/Player/PlayerObject.ts @@ -70,7 +70,7 @@ export class PlayerObject implements IPlayer { moneySourceB: MoneySourceTracker; playtimeSinceLastAug: number; playtimeSinceLastBitnode: number; - purchasedServers: any[]; + purchasedServers: string[]; queuedAugmentations: IPlayerOwnedAugmentation[]; scriptProdSinceLastAug: number; sleeves: Sleeve[]; diff --git a/src/Server/data/servers.ts b/src/Server/data/servers.ts index f5eee7b52..4c836e011 100644 --- a/src/Server/data/servers.ts +++ b/src/Server/data/servers.ts @@ -69,8 +69,6 @@ interface IServerMetadata { * A "unique" server that has special implications when the player manually hacks it. */ specialName?: string; - - [key: string]: any; } /** diff --git a/src/Terminal/commands/download.ts b/src/Terminal/commands/download.ts index fe6cec892..7060ee4b7 100644 --- a/src/Terminal/commands/download.ts +++ b/src/Terminal/commands/download.ts @@ -34,7 +34,7 @@ export function exportScripts(pattern: string, server: BaseServer): void { // Return an error if no files matched, rather than an empty zip folder if (Object.keys(zip.files).length == 0) throw new Error(`No files match the pattern ${pattern}`); const zipFn = `bitburner${isScriptFilename(pattern) ? "Scripts" : pattern === "*.txt" ? "Texts" : "Files"}.zip`; - zip.generateAsync({ type: "blob" }).then((content: any) => FileSaver.saveAs(content, zipFn)); + zip.generateAsync({ type: "blob" }).then((content: Blob) => FileSaver.saveAs(content, zipFn)); } export function download( diff --git a/src/Terminal/commands/ls.tsx b/src/Terminal/commands/ls.tsx index 1fddc05e8..f66560e77 100644 --- a/src/Terminal/commands/ls.tsx +++ b/src/Terminal/commands/ls.tsx @@ -8,18 +8,17 @@ import { BaseServer } from "../../Server/BaseServer"; import { evaluateDirectoryPath, getFirstParentDirectory, isValidDirectoryPath } from "../DirectoryHelpers"; import { IRouter } from "../../ui/Router"; import { ITerminal } from "../ITerminal"; -import * as libarg from "arg"; +import libarg from "arg"; import { showLiterature } from "../../Literature/LiteratureHelpers"; import { MessageFilenames, showMessage } from "../../Message/MessageHelpers"; +import { ScriptArg } from "../../Netscript/ScriptArg"; -export function ls( - terminal: ITerminal, - router: IRouter, - player: IPlayer, - server: BaseServer, - args: (string | number | boolean)[], -): void { - let flags; +export function ls(terminal: ITerminal, router: IRouter, player: IPlayer, server: BaseServer, args: ScriptArg[]): void { + interface LSFlags { + ["-l"]: boolean; + ["--grep"]: string; + } + let flags: LSFlags; try { flags = libarg( { @@ -235,7 +234,7 @@ export function ls( segments: string[]; } - function postSegments(group: FileGroup, flags: any): void { + function postSegments(group: FileGroup, flags: LSFlags): void { const segments = group.segments; const linked = group.type === FileType.Script || group.type === FileType.Message; const maxLength = Math.max(...segments.map((s) => s.length)) + 1; diff --git a/src/Terminal/commands/wget.ts b/src/Terminal/commands/wget.ts index 8717ffcc2..d6eaf141d 100644 --- a/src/Terminal/commands/wget.ts +++ b/src/Terminal/commands/wget.ts @@ -25,12 +25,12 @@ export function wget( } $.get( url, - function (data: any) { + function (data: unknown) { let res; if (isScriptFilename(target)) { - res = server.writeToScriptFile(player, target, data); + res = server.writeToScriptFile(player, target, String(data)); } else { - res = server.writeToTextFile(target, data); + res = server.writeToTextFile(target, String(data)); } if (!res.success) { return terminal.error("wget failed");