Binge of (mostly) mindless tsification (compiler-explorer#6838)

Turned on `noImplicitAny` in tsconfig, then went around fixing some random easy stuff. Hopefully tsification-PRs with more real content coming up.
OfekShilon · Sep 7, 2024 · 9ef46fb · 9ef46fb
1 parent 78e075f
commit 9ef46fb
Show file tree

Hide file tree

Showing 98 changed files with 336 additions and 189 deletions.
diff --git a/app.ts b/app.ts
@@ -700,11 +700,11 @@ async function main() {
         return options;
     }
 
-    function isMobileViewer(req) {
+    function isMobileViewer(req: express.Request) {
         return req.header('CloudFront-Is-Mobile-Viewer') === 'true';
     }
 
-    function renderGoldenLayout(config, metadata, req, res) {
+    function renderGoldenLayout(config, metadata, req: express.Request, res: express.Response) {
         staticHeaders(res);
         contentPolicyHeader(res);
 

diff --git a/lib/aws.ts b/lib/aws.ts
@@ -119,7 +119,7 @@ export async function initConfig(properties: PropertyGetter) {
     awsConfig = await loadAwsConfig(properties);
 }
 
-export function getConfig(name): string {
+export function getConfig(name: string): string {
     if (!awsConfigInit) throw new Error("Reading AWS config before it's loaded");
     return awsConfig[name] || unwrap(awsProps)<string>(name);
 }
diff --git a/lib/base-compiler.ts b/lib/base-compiler.ts
@@ -588,11 +588,11 @@ export class BaseCompiler implements ICompiler {
     }
 
     async objdump(
-        outputFilename,
+        outputFilename: string,
         result: any,
         maxSize: number,
-        intelAsm,
-        demangle,
+        intelAsm: boolean,
+        demangle: boolean,
         staticReloc: boolean | undefined,
         dynamicReloc: boolean,
         filters: ParseFiltersAndOutputOptions,
@@ -651,7 +651,7 @@ export class BaseCompiler implements ICompiler {
         };
     }
 
-    protected filename(fn) {
+    protected filename(fn: string) {
         return fn;
     }
 
@@ -1167,7 +1167,7 @@ export class BaseCompiler implements ICompiler {
         return userOptions;
     }
 
-    async generateAST(inputFilename, options): Promise<ResultLine[]> {
+    async generateAST(inputFilename: string, options: string[]): Promise<ResultLine[]> {
         // These options make Clang produce an AST dump
         const newOptions = options
             .filter(option => option !== '-fcolor-diagnostics')
@@ -1659,7 +1659,11 @@ export class BaseCompiler implements ICompiler {
         else return null;
     }
 
-    async checkOutputFileAndDoPostProcess(asmResult, outputFilename: string, filters: ParseFiltersAndOutputOptions) {
+    async checkOutputFileAndDoPostProcess(
+        asmResult: CompilationResult,
+        outputFilename: string,
+        filters: ParseFiltersAndOutputOptions,
+    ) {
         try {
             const stat = await fs.stat(outputFilename);
             asmResult.asmSize = stat.size;
@@ -2030,7 +2034,7 @@ export class BaseCompiler implements ICompiler {
     }
 
     async handleExecution(
-        key,
+        key: CacheKey,
         executeParameters: ExecutableExecutionOptions,
         bypassCache: BypassCache,
     ): Promise<CompilationResult> {
@@ -3126,8 +3130,8 @@ but nothing was dumped. Possible causes are:
                       outputFilename,
                       result,
                       maxSize,
-                      filters.intel,
-                      filters.demangle,
+                      !!filters.intel,
+                      !!filters.demangle,
                       filters.binaryObject,
                       false,
                       filters,

diff --git a/lib/cfg/cfg-parsers/base.ts b/lib/cfg/cfg-parsers/base.ts
@@ -107,7 +107,7 @@ export class BaseCFGParser {
         let rangeBb: BBRange = {nameId: functionName, start: first, end: 0, actionPos: []};
         const result: BBRange[] = [];
 
-        const newRangeWith = function (oldRange, nameId, start) {
+        const newRangeWith = function (oldRange: BBRange, nameId: string, start: number) {
             return {nameId: nameId, start: start, actionPos: [], end: oldRange.end};
         };
 

diff --git a/lib/compilers/ada.ts b/lib/compilers/ada.ts
@@ -25,19 +25,21 @@
 
 import path from 'path';
 
+import {CompileChildLibraries} from '../../types/compilation/compilation.interfaces.js';
 import type {ConfiguredOverrides} from '../../types/compilation/compiler-overrides.interfaces.js';
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {unwrap} from '../assert.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import * as utils from '../utils.js';
 
 export class AdaCompiler extends BaseCompiler {
     static get key() {
         return 'ada';
     }
 
-    constructor(info: PreliminaryCompilerInfo, env) {
+    constructor(info: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(info, env);
 
         this.outputFilebase = 'example';
@@ -85,7 +87,7 @@ export class AdaCompiler extends BaseCompiler {
         backendOptions: Record<string, any>,
         inputFilename: string,
         outputFilename: string,
-        libraries,
+        libraries: CompileChildLibraries[],
         overrides: ConfiguredOverrides,
     ) {
         backendOptions = backendOptions || {};

diff --git a/lib/compilers/analysis-tool.ts b/lib/compilers/analysis-tool.ts
@@ -24,14 +24,15 @@
 
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 
 // Plain compiler, which just runs the tool and returns whatever the output was
 export class AnalysisTool extends BaseCompiler {
     static get key() {
         return 'analysis-tool';
     }
 
-    constructor(info: PreliminaryCompilerInfo, env) {
+    constructor(info: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(
             {
                 // Default is to disable all "cosmetic" filters

diff --git a/lib/compilers/assembly.ts b/lib/compilers/assembly.ts
@@ -27,10 +27,11 @@ import path from 'path';
 
 import _ from 'underscore';
 
-import type {BuildResult} from '../../types/compilation/compilation.interfaces.js';
+import type {BuildResult, CompilationResult} from '../../types/compilation/compilation.interfaces.js';
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {AsmRaw} from '../parsers/asm-raw.js';
 import {fileExists} from '../utils.js';
 
@@ -41,7 +42,7 @@ export class AssemblyCompiler extends BaseCompiler {
         return 'assembly';
     }
 
-    constructor(info: PreliminaryCompilerInfo, env) {
+    constructor(info: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(info, env);
         this.asm = new AsmRaw();
     }
@@ -59,7 +60,7 @@ export class AssemblyCompiler extends BaseCompiler {
         return [];
     }
 
-    getGeneratedOutputFilename(fn: string) {
+    getGeneratedOutputFilename(fn: string): string {
         const outputFolder = path.dirname(fn);
         const files = fs.readdirSync(outputFolder);
 
@@ -77,7 +78,7 @@ export class AssemblyCompiler extends BaseCompiler {
         return this.getGeneratedOutputFilename(path.join(dirPath, 'example.asm'));
     }
 
-    async runReadelf(fullResult, objectFilename) {
+    async runReadelf(fullResult: BuildResult, objectFilename: string) {
         const execOptions = this.getDefaultExecOptions();
         execOptions.customCwd = path.dirname(objectFilename);
         return await this.doBuildstepAndAddToResult(
@@ -89,7 +90,7 @@ export class AssemblyCompiler extends BaseCompiler {
         );
     }
 
-    async getArchitecture(fullResult, objectFilename) {
+    async getArchitecture(fullResult: BuildResult, objectFilename: string) {
         const result = await this.runReadelf(fullResult, objectFilename);
         const output = result.stdout.map(line => line.text).join('\n');
         if (output.includes('ELF32') && output.includes('80386')) {
@@ -183,7 +184,11 @@ export class AssemblyCompiler extends BaseCompiler {
         return fullResult;
     }
 
-    override checkOutputFileAndDoPostProcess(asmResult, outputFilename, filters: ParseFiltersAndOutputOptions) {
+    override checkOutputFileAndDoPostProcess(
+        asmResult: CompilationResult,
+        outputFilename: string,
+        filters: ParseFiltersAndOutputOptions,
+    ) {
         return this.postProcess(asmResult, outputFilename, filters);
     }
 

diff --git a/lib/compilers/avrgcc6502.ts b/lib/compilers/avrgcc6502.ts
@@ -28,6 +28,7 @@ import type {ExecutionOptions} from '../../types/compilation/compilation.interfa
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 
 export class AvrGcc6502Compiler extends BaseCompiler {
     private readonly avrgccpath: string;
@@ -38,7 +39,7 @@ export class AvrGcc6502Compiler extends BaseCompiler {
         return 'avrgcc6502';
     }
 
-    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+    constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(compilerInfo, env);
 
         this.avrgccpath = this.compilerProps<string>(`compiler.${this.compiler.id}.avrgccpath`);

diff --git a/lib/compilers/beebasm.ts b/lib/compilers/beebasm.ts
@@ -31,6 +31,7 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import {ArtifactType} from '../../types/tool.interfaces.js';
 import {addArtifactToResult} from '../artifact-utils.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {AsmParserBeebAsm} from '../parsers/asm-parser-beebasm.js';
 import * as utils from '../utils.js';
 
@@ -39,7 +40,7 @@ export class BeebAsmCompiler extends BaseCompiler {
         return 'beebasm';
     }
 
-    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+    constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(compilerInfo, env);
 
         this.asm = new AsmParserBeebAsm(this.compilerProps);

diff --git a/lib/compilers/c3c.ts b/lib/compilers/c3c.ts
@@ -3,13 +3,14 @@ import path from 'path';
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 
 export class C3Compiler extends BaseCompiler {
     static get key() {
         return 'c3c';
     }
 
-    constructor(info: PreliminaryCompilerInfo, env) {
+    constructor(info: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(info, env);
         this.compiler.supportsIrView = true;
         this.compiler.irArg = ['--emit-llvm'];

diff --git a/lib/compilers/carbon.ts b/lib/compilers/carbon.ts
@@ -28,6 +28,7 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import type {ResultLine} from '../../types/resultline/resultline.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 
 import {BaseParser} from './argument-parsers.js';
 
@@ -36,7 +37,7 @@ export class CarbonCompiler extends BaseCompiler {
         return 'carbon';
     }
 
-    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+    constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(compilerInfo, env);
         this.compiler.demangler = '';
         this.demanglerClass = null;

diff --git a/lib/compilers/cc65.ts b/lib/compilers/cc65.ts
@@ -27,12 +27,13 @@ import path from 'path';
 import fs from 'fs-extra';
 import _ from 'underscore';
 
-import type {CompilationResult} from '../../types/compilation/compilation.interfaces.js';
+import type {CompilationResult, CompileChildLibraries} from '../../types/compilation/compilation.interfaces.js';
 import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {ArtifactType} from '../../types/tool.interfaces.js';
 import {addArtifactToResult} from '../artifact-utils.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {CC65AsmParser} from '../parsers/asm-parser-cc65.js';
 import * as utils from '../utils.js';
 
@@ -41,14 +42,14 @@ export class Cc65Compiler extends BaseCompiler {
         return 'cc65';
     }
 
-    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+    constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(compilerInfo, env);
 
         this.asm = new CC65AsmParser(this.compilerProps);
         this.toolchainPath = path.resolve(path.dirname(compilerInfo.exe), '..');
     }
 
-    override getSharedLibraryPathsAsArguments(libraries, libDownloadPath?) {
+    override getSharedLibraryPathsAsArguments(libraries: CompileChildLibraries[], libDownloadPath?: string) {
         const libPathFlag = this.compiler.libpathFlag || '-L';
 
         if (!libDownloadPath) {
@@ -96,11 +97,11 @@ export class Cc65Compiler extends BaseCompiler {
     }
 
     override async objdump(
-        outputFilename,
+        outputFilename: string,
         result: CompilationResult,
         maxSize: number,
-        intelAsm,
-        demangle,
+        intelAsm: boolean,
+        demangle: boolean,
         staticReloc: boolean,
         dynamicReloc: boolean,
         filters: ParseFiltersAndOutputOptions,

diff --git a/lib/compilers/cerberus.ts b/lib/compilers/cerberus.ts
@@ -29,6 +29,7 @@ import type {PreliminaryCompilerInfo} from '../../types/compiler.interfaces.js';
 import {ExecutableExecutionOptions} from '../../types/execution/execution.interfaces.js';
 import type {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
+import {CompilationEnvironment} from '../compilation-env.js';
 import {logger} from '../logger.js';
 import * as utils from '../utils.js';
 
@@ -37,7 +38,7 @@ export class CerberusCompiler extends BaseCompiler {
         return 'cerberus';
     }
 
-    constructor(compilerInfo: PreliminaryCompilerInfo, env) {
+    constructor(compilerInfo: PreliminaryCompilerInfo, env: CompilationEnvironment) {
         super(
             {
                 // Default is to disable all "cosmetic" filters
@@ -61,7 +62,7 @@ export class CerberusCompiler extends BaseCompiler {
         return path.join(dirPath, `${path.basename(this.compileFilename, this.lang.extensions[0])}.co`);
     }
 
-    override async objdump(outputFilename, result: any, maxSize: number) {
+    override async objdump(outputFilename: string, result: any, maxSize: number) {
         if (!(await utils.fileExists(outputFilename))) {
             result.asm = '<No output file ' + outputFilename + '>';
             return result;

diff --git a/lib/compilers/circle.ts b/lib/compilers/circle.ts
@@ -25,6 +25,7 @@
 import path from 'path';
 
 import {ExecutionOptions} from '../../types/compilation/compilation.interfaces.js';
+import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces.js';
 import {BaseCompiler} from '../base-compiler.js';
 
 import {CircleParser} from './argument-parsers.js';
@@ -38,7 +39,7 @@ export class CircleCompiler extends BaseCompiler {
         return CircleParser;
     }
 
-    override optionsForFilter(filters, outputFilename) {
+    override optionsForFilter(filters: ParseFiltersAndOutputOptions, outputFilename: string) {
         let options = [`-o=${this.filename(outputFilename)}`];
         if (this.compiler.intelAsm && filters.intel && !filters.binary) {
             options = options.concat(this.compiler.intelAsm.split(' '));
@@ -49,16 +50,16 @@ export class CircleCompiler extends BaseCompiler {
         return options;
     }
 
-    override getOutputFilename(dirPath, outputFilebase) {
+    override getOutputFilename(dirPath: string, outputFilebase: string) {
         // Do not add '.s' as default implementation does,
         // because circle emit assembly file instead of executable.
         return path.join(dirPath, outputFilebase);
     }
 
     override async runCompiler(
-        compiler,
-        options,
-        inputFilename,
+        compiler: string,
+        options: string[],
+        inputFilename: string,
         execOptions: ExecutionOptions & {env: Record<string, string>},
     ) {
         if (!execOptions) {