Tsify main (#4520)

lib/common-utils.ts

@@ -29,6 +29,6 @@ export function isString(x: any): x is string {
 // Object.keys is typed as returning :string[] for some reason
 // This util is for cases where the key is a union of a few possible keys and we
 // want the resulting array properly typed.
-export function keys<K extends string | number | symbol>(o: Record<K, any>): K[] {
+export function keys<K extends string | number | symbol>(o: Partial<Record<K, any>>): K[] {
     return Object.keys(o) as K[];
 }

lib/compilers/hook.ts

@@ -24,12 +24,11 @@
 
 import path from 'path';
 
+import {ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces';
 import {CompilationResult, ExecutionOptions} from '../../types/compilation/compilation.interfaces';
 import {ParseFiltersAndOutputOptions} from '../../types/features/filters.interfaces';
 import {BaseCompiler} from '../base-compiler';
 
-import {AsmResultSource, ParsedAsmResultLine} from '../../types/asmresult/asmresult.interfaces';
-
 export class HookCompiler extends BaseCompiler {
     static get key(): string {
         return 'hook';

lib/options-handler.ts

@@ -54,6 +54,7 @@ export type OptionHandlerArguments = {
     suppressConsoleLog: boolean;
 };
 
+// TODO: Is this the same as Options in static/options.interfaces.ts?
 type OptionsType = {
     googleAnalyticsAccount: string;
     googleAnalyticsEnabled: boolean;
@@ -188,7 +189,7 @@ export class ClientOptionsHandler {
             sentryEnvironment: ceProps('sentryEnvironment') || defArgs.env[0],
             release: defArgs.releaseBuildNumber || defArgs.gitReleaseName,
             gitReleaseCommit: defArgs.gitReleaseName || '',
-            cookieDomainRe: cookieDomainRe,
+            cookieDomainRe,
             localStoragePrefix: ceProps('localStoragePrefix'),
             cvCompilerCountMax: ceProps('cvCompilerCountMax', 6),
             defaultFontScale: ceProps('defaultFontScale', 14),

package.json

@@ -26,6 +26,7 @@
     "@sentry/node": "^7.28.1",
     "@types/body-parser": "^1.19.2",
     "@types/file-saver": "^2.0.5",
+    "@types/js-cookie": "^3.0.2",
     "@types/http-proxy": "^1.17.9",
     "@types/request": "^2.48.8",
     "aws-sdk": "^2.1048.0",

static/analytics.ts

@@ -93,5 +93,4 @@ class GAProxy {
     }
 }
 
-const ga = new GAProxy();
-export {ga};
+export const ga = new GAProxy();

static/components.interfaces.ts

@@ -60,12 +60,12 @@ export interface ComponentConfig<S> {
     componentState: S;
 }
 
-type StateWithLanguage = {lang: string};
+export type StateWithLanguage = {lang: string};
 // TODO(#4490 The War of The Types) We should normalize state types
-type StateWithEditor = {source: string | number};
-type StateWithTree = {tree: number};
-type StateWithId = {id: number};
-type EmptyState = Record<never, never>;
+export type StateWithEditor = {source: string | number};
+export type StateWithTree = {tree: number};
+export type StateWithId = {id: number};
+export type EmptyState = Record<never, never>;
 
 export type EmptyCompilerState = StateWithLanguage & StateWithEditor;
 export type PopulatedCompilerState = StateWithEditor & {

static/global.ts

@@ -25,7 +25,7 @@
 import {IFrontendTesting} from './tests/frontend-testing.interfaces';
 import {Options} from './options.interfaces';
 
-type CompilerExplorerOptions = Record<string, unknown> & Options;
+export type CompilerExplorerOptions = Record<string, unknown> & Options;
 
 declare global {
     export interface Window {
@@ -36,6 +36,8 @@ declare global {
         ga: any;
         GoogleAnalyticsObject: any;
         hasUIBeenReset: boolean;
+        PRODUCTION: boolean;
+        onSponsorClick: (sponsorUrl: string) => void;
     }
 }
 

static/hub.ts

@@ -100,9 +100,9 @@ export class Hub {
     public subdomainLangId: string | undefined;
     public defaultLangId: string;
 
-    public constructor(public readonly layout: GoldenLayout, subLangId: string, defaultLangId: string) {
+    public constructor(public readonly layout: GoldenLayout, subLangId: string | undefined, defaultLangId: string) {
         this.lastOpenedLangId = null;
-        this.subdomainLangId = subLangId || undefined;
+        this.subdomainLangId = subLangId;
         this.defaultLangId = defaultLangId;
         this.compilerService = new CompilerService(this.layout.eventHub);
 

static/local.ts

@@ -26,7 +26,7 @@ import {options} from './options';
 
 const prefix = options.localStoragePrefix ?? '';
 
-export function get(key: string, ifNotPresent: string): string {
+export function get<T>(key: string, ifNotPresent: T): string | T {
     try {
         return window.localStorage.getItem(prefix + key) ?? ifNotPresent;
     } catch (e) {