chore: fix style & types

Author: typed-sigterm

eslint.config.js

@@ -6,9 +6,6 @@ export default ts({
     'no-cond-assign': [0],
     'no-console': [2],
     'ts/explicit-function-return-type': [2],
-    'import/extensions': [2, 'ignorePackages', {
-      checkTypeImports: true,
-    }],
   },
 }, {
   files: ['scripts/*.ts'],

src/platform.ts

@@ -2,7 +2,7 @@ import type { $Fetch, CreateFetchOptions, FetchOptions } from 'ofetch';
 import type { Contest } from './contest.ts';
 import type { Problem } from './problem.ts';
 import { ofetch } from 'ofetch';
-import { addHeaders, UnOJError, version } from './utils.ts';
+import { mergeHeaders, UnOJError, version } from './utils.ts';
 
 /** General platform constructor options. */
 export interface PlatformOptions<Locale extends string | never = never> {
@@ -52,7 +52,7 @@ export abstract class Platform<Locale extends string | never = never> {
     this.ofetch = options?.ofetch ?? ofetch.create({
       ...options?.ofetchDefaults,
       baseURL: this.baseURL,
-      headers: addHeaders(headers, [['user-agent', `UnOJ/${version}`]]),
+      headers: mergeHeaders(headers, [['user-agent', `UnOJ/${version}`]]),
     }, options?.ofetchCreateOptions);
 
     this.locale = options?.locale ?? defaultLocale;

src/platforms/atcoder.ts

@@ -65,7 +65,7 @@ export default class AtCoder extends Platform<Locale> {
       .text()
       .trimStart()
       .split('\n')[0]
-      .split(' - ')[1];
+      ?.split(' - ')[1] ?? '';
     const descContainer = statement.find(`span.lang-${this.locale}`);
     const hr = descContainer.find('hr').first();
     if (hr.length) {
@@ -108,8 +108,8 @@ export default class AtCoder extends Platform<Locale> {
 
       description,
       samples,
-      timeLimit: parseTime(tlMatch![1])!,
-      memoryLimit: parseMemory(mlMatch![1])!,
+      timeLimit: parseTime(tlMatch?.[1])!,
+      memoryLimit: parseMemory(mlMatch?.[1])!,
 
       difficulty: undefined,
       tags: undefined,

src/platforms/hydro.ts

@@ -46,7 +46,7 @@ export function parseHydroProblem(pdoc: any, lang?: string): Problem {
   for (let i = 1, match: any; match = r(i, 'input').exec(content); i++) {
     samples.push({
       input: match[1].trim(),
-      output: r(i, 'output').exec(content)?.[1].trim() || '',
+      output: r(i, 'output').exec(content)?.[1]?.trim() || '',
     });
   }
 

src/platforms/luogu.ts

@@ -8,7 +8,7 @@ import type { PlatformOptions } from '../platform.ts';
 import type { Problem as BaseProblem, ProblemDescriptionObject, TagInfo } from '../problem.ts';
 import { FetchError } from 'ofetch';
 import { NotFoundError, Platform } from '../platform.ts';
-import { addHeaders, UnOJError } from '../utils.ts';
+import { mergeHeaders, UnOJError } from '../utils.ts';
 
 export type ProblemType = 'traditional' | 'interactive' | 'communication' | 'submission';
 export type Difficulty = 0 | 1 | 2 | 3 | 4 | 5 | 6 | 7;
@@ -74,7 +74,7 @@ export default class Luogu extends Platform<string> {
       ...options,
       ofetchDefaults: {
         ...options?.ofetchDefaults,
-        headers: addHeaders(
+        headers: mergeHeaders(
           options?.ofetchDefaults?.headers,
           [['x-lentille-request', 'content-only'], ['x-luogu-type', 'content-only']],
         ),

src/utils.ts

@@ -1,3 +1,5 @@
+import type { HeadersInit } from 'bun';
+
 export { version } from '../package.json' with { type: 'json' };
 
 /** Get the first key of an object. */
@@ -10,7 +12,9 @@ export function getFirstKey<T extends Record<never, never>>(obj: T): keyof T {
  * @param s The string to parse.
  * @returns The time in milliseconds, or undefined if failed.
  */
-export function parseTime(s: string): number | undefined {
+export function parseTime(s?: string): number | undefined {
+  if (!s)
+    return;
   const val = Number.parseInt(s);
   if (Number.isNaN(val))
     return;
@@ -36,35 +40,31 @@ const MEMORY_UNITS: Record<string, number> = {
  * @param s The string to parse.
  * @returns The memory size in bytes, or undefined if failed.
  */
-export function parseMemory(s: string): number | undefined {
-  const [, val, unit] = s.match(/^(\d+) ([a-z]+)$/i) ?? [];
+export function parseMemory(s?: string): number | undefined {
+  const [, val, unit] = s?.match(/^(\d+) ([a-z]+)$/i) ?? [];
   if (!val || !unit)
     return;
-  return Number(val) * MEMORY_UNITS[unit];
+  return Number(val) * (MEMORY_UNITS[unit] ?? Number.NaN);
 }
 
 /**
  * Adds key-value pairs to the provided headers object if they aren't present.
  *
- * @param h The original headers object.
+ * @param init The original headers object.
  * @param add The key-value pairs to add.
  * @returns A **new** headers object.
  */
-export function addHeaders(h: HeadersInit | undefined, add: Array<[string, string]>): Record<string, string> {
-  if (h instanceof Headers)
-    h = h.toJSON();
-  if (Array.isArray(h))
-    h = Object.fromEntries(h);
-  else if (h == null)
-    h = {};
-  else
-    h = structuredClone(h);
-
-  for (const item of add) {
-    if (!(item[0] in h))
-      h[item[0]] = item[1];
-  }
-  return h;
+export function mergeHeaders(init: HeadersInit | undefined, add: Array<[string, string]>): Headers {
+  const ret = new Headers(
+    init instanceof Headers
+      ? init
+      : Array.isArray(init)
+        ? Object.fromEntries(init)
+        : init,
+  );
+  for (const item of add)
+    ret.append(item[0], item[1]);
+  return ret!;
 }
 
 /** General error class for UnOJ. */