重构 contestData.d.ts

Author: Mr-Python-in-China

src/compiler/index.ts

@@ -7,7 +7,7 @@ import remarkParse from "remark-parse";
 import { unified } from "unified";
 import remarkTypst from "./remarkTypst";
 import { isAxiosError } from "axios";
-import type ContestData from "@/types/contestData";
+import type { ContestData } from "@/types/contestData";
 import {
   type CompileTypstMessage,
   type RenderTypstMessage,
@@ -45,11 +45,11 @@ async function downloadMultiData(
     percent: number;
     loaded: number;
     total: number | undefined;
-  }) => void,
+  }) => void
 ) {
   const tasks = urls.map(
     (
-      url,
+      url
     ): {
       loaded: number;
       total: number | undefined;
@@ -70,7 +70,7 @@ async function downloadMultiData(
                 a == undefined || b.total === undefined
                   ? undefined
                   : a + b.total,
-              0,
+              0
             );
             report({
               percent: totalSize ? (totalLoaded / totalSize) * 100 : 0,
@@ -83,11 +83,11 @@ async function downloadMultiData(
           url,
           new Response(res.data, {
             headers: { "Content-Type": "application/octet-stream" },
-          }),
+          })
         );
         return res.data;
       },
-    }),
+    })
   );
   return await Promise.all(tasks.map((x) => x.exec()));
 }
@@ -109,7 +109,7 @@ export class TypstInitTask {
       (e) => {
         this.status = "rejected";
         throw e;
-      },
+      }
     );
   }
   updateProgress(info: {
@@ -143,7 +143,7 @@ export const typstInitInfo: {
 } = {
   compiler: new TypstInitTask(
     downloadMultiData([TypstCompilerWasmUrl, TypstRendererWasmUrl], (x) =>
-      typstInitInfo.compiler.updateProgress(x),
+      typstInitInfo.compiler.updateProgress(x)
     ).then(
       (res) => {
         typstCompilerWasm = res[0];
@@ -153,8 +153,8 @@ export const typstInitInfo: {
       (e) => {
         typstInitInfo.compiler.status = "rejected";
         throw e;
-      },
-    ),
+      }
+    )
   ),
   font: new TypstInitTask(
     (async () => {
@@ -174,7 +174,7 @@ export const typstInitInfo: {
               postscriptName: fontName,
               blob: () => cached.blob(),
             });
-        }),
+        })
       );
       if (unCachedFontUrlEntries.length && window.queryLocalFonts) {
         await requestFontAccessConfirm();
@@ -189,60 +189,60 @@ export const typstInitInfo: {
               blob: async () => {
                 const blob = await x.blob();
                 const fontUrl = unCachedFontUrlEntries.find(
-                  (v) => v[0] === x.postscriptName,
+                  (v) => v[0] === x.postscriptName
                 )?.[1];
                 if (fontUrl)
                   browserCache.put(
                     fontUrl,
                     new Response(blob, {
                       headers: { "Content-Type": "application/octet-stream" },
-                    }),
+                    })
                   );
                 return blob;
               },
-            })),
+            }))
           );
         } catch {
           // ignore
         }
       }
       for (const [fontName, fontUrl] of fontUrlEntries) {
         const fontData = localFontDatas.find(
-          (x) => x.postscriptName === fontName,
+          (x) => x.postscriptName === fontName
         );
         if (fontData)
           localFontPromises.push(
-            fontData.blob().then(async (b) => await b.arrayBuffer()),
+            fontData.blob().then(async (b) => await b.arrayBuffer())
           );
         else remoteFontUrls.push(fontUrl);
       }
       fontBuffers = (
         await Promise.all([
           ...localFontPromises,
           downloadMultiData(remoteFontUrls, (x) =>
-            typstInitInfo.font.updateProgress(x),
+            typstInitInfo.font.updateProgress(x)
           ),
         ])
       ).flat();
-    })(),
+    })()
   ),
   package: new TypstInitTask(
     (async () => {
       const urls = RequiredPreloadPackages.map(
         (pkg) =>
-          `https://packages.typst.org/preview/${pkg.name}-${pkg.version}.tar.gz`,
+          `https://packages.typst.org/preview/${pkg.name}-${pkg.version}.tar.gz`
       );
       const datas = await downloadMultiData(urls, (x) =>
-        typstInitInfo.package.updateProgress(x),
+        typstInitInfo.package.updateProgress(x)
       );
       for (let i = 0; i < urls.length; ++i)
         preloadedPackages.set(urls[i], datas[i]);
-    })(),
+    })()
   ),
 };
 export let typstInitStatus: PromiseStatus = "pending";
 export const typstInitPromise = Promise.all(
-  Object.values(typstInitInfo).map((x) => x.promise),
+  Object.values(typstInitInfo).map((x) => x.promise)
 )
   .then(async () => {
     await send<InitMessage>("init", worker, {
@@ -266,7 +266,7 @@ const processor = unified()
   .freeze();
 
 function compilerPrepare(
-  data: ContestData<{ withMarkdown: true }>,
+  data: ContestData<{ withMarkdown: true }>
 ): [ContestData<{ withTypst: true }>, [string, string][]] {
   const assets = new Map<string, string>();
   const problemsWithTypst = data.problems.map((problem) => {
@@ -376,15 +376,15 @@ async function fetchAsset(url: string): Promise<ArrayBuffer> {
   if (url.startsWith("asset://")) {
     const uuid = url.substring(8); // Remove "asset://" prefix
     const blobUrl = assetUrlMapping.get(uuid);
-    
+
     if (!blobUrl) {
       throw new Error(`Asset not found: ${uuid}`);
     }
-    
+
     // Fetch the blob URL using axios
     url = blobUrl;
   }
-  
+
   // Handle regular URLs (including mapped blob URLs)
   try {
     const response = await axiosInstance.get<ArrayBuffer>(url);
@@ -393,7 +393,7 @@ async function fetchAsset(url: string): Promise<ArrayBuffer> {
     if (isAxiosError(e)) {
       console.error("Failed to download assets.", e);
       throw new Error(
-        "下载资源失败。这或许是因为浏览器的跨域限制。你可以尝试手动上传图片。",
+        "下载资源失败。这或许是因为浏览器的跨域限制。你可以尝试手动上传图片。"
       );
     }
     throw e;

src/compiler/typst.worker.ts

@@ -14,7 +14,7 @@ import {
 } from "@myriaddreamin/typst.ts/options.init";
 import { listen, sendToMain } from "@mr.python/promise-worker-ts";
 import { Mutex } from "async-mutex";
-import type ContestData from "../types/contestData";
+import type { ContestData } from "@/types/contestData";
 
 import TypstDocMain from "typst-template/main.typ?raw";
 import TypstDocUtils from "typst-template/utils.typ?raw";

src/contestEditor/exampleStatements.ts

@@ -1,4 +1,4 @@
-import type ContestData from "@/types/contestData";
+import type { ContestData } from "@/types/contestData";
 
 const exampleFiles = import.meta.glob<true, "raw">(
   ["./*/data.json", "./*/precaution.md", "./*/problem-*.md"],

src/contestEditor/preview.tsx

@@ -1,5 +1,5 @@
 import { memo, useEffect, useRef, useState } from "react";
-import type ContestData from "@/types/contestData";
+import type { ContestData } from "@/types/contestData";
 import { compileToSvgDebounced } from "@/compiler";
 import { Alert } from "antd";
 import { isEqual } from "lodash";

src/types/contestData.d.ts

@@ -1,4 +1,11 @@
-export interface ProblemData {
+export type DateArr = [number, number, number, number, number, number];
+
+export interface LanguageConfig {
+  name: string;
+  compile_options: string;
+}
+
+export interface ProblemDataBase {
   name: string;
   title: string;
   type: string;
@@ -14,80 +21,79 @@ export interface ProblemData {
   pretestcase: string;
 }
 
-/** [year, month, day, hour, minute, second] */
-export type DateArr = [number, number, number, number, number, number];
+export type ContentFlags = {
+  withMarkdown?: boolean;
+  withTypst?: boolean;
+};
+
+type MarkdownProblemExt<Conf extends ContentFlags> =
+  Conf["withMarkdown"] extends true ? { statementMarkdown: string } : object;
+type TypstProblemExt<Conf extends ContentFlags> = Conf["withTypst"] extends true
+  ? { statementTypst: string }
+  : object;
+
+export type ProblemData<Conf extends ContentFlags = ContentFlags> =
+  ProblemDataBase & MarkdownProblemExt<Conf> & TypstProblemExt<Conf>;
 
-type ContestData<
-  Conf extends {
-    withMarkdown?: boolean;
-    withTypst?: boolean;
-  } = {
-    withMarkdown: false;
-    withTypst: false;
-  },
-> = {
+export interface ContestDateRange {
+  start: DateArr;
+  end: DateArr;
+}
+
+type MarkdownContestExt<Conf extends ContentFlags> =
+  Conf["withMarkdown"] extends true ? { precautionMarkdown: string } : object;
+type TypstContestExt<Conf extends ContentFlags> = Conf["withTypst"] extends true
+  ? { precautionTypst: string }
+  : object;
+
+/**
+ * 基础比赛配置（不含可选扩展）。
+ */
+export interface ContestDataBase<Conf extends ContentFlags = ContentFlags> {
   title: string;
   subtitle: string;
   dayname: string;
-  date: {
-    start: DateArr;
-    end: DateArr;
-  };
+  date: ContestDateRange;
   noi_style: boolean;
   file_io: boolean;
   use_pretest: boolean;
-  support_languages: {
-    name: string;
-    compile_options: string;
-  }[];
-  problems: (ProblemData &
-    (Conf["withMarkdown"] extends true // with markdown
-      ? { statementMarkdown: string }
-      : unknown) &
-    (Conf["withTypst"] extends true // with typst
-      ? { statementTypst: string }
-      : unknown))[];
-} & (Conf["withMarkdown"] extends true
-  ? { precautionMarkdown: string }
-  : unknown) &
-  (Conf["withTypst"] extends true ? { precautionTypst: string } : unknown);
-
-export default ContestData;
+  support_languages: LanguageConfig[];
+  problems: ProblemData<Conf>[];
+}
 
-export interface ImmerContestData extends ContestData<{ withMarkdown: true }> {
-  problems: (ContestData<{ withMarkdown: true }>["problems"][number] & {
-    key: import("crypto").UUID;
-  })[];
-  support_languages: (ContestData<{
-    withMarkdown: true;
-  }>["support_languages"][number] & {
-    key: import("crypto").UUID;
-  })[];
-  images: {
-    uuid: string;
-    name: string;
-    url: string; // blob URL for display
-  }[];
+export type ContestData<
+  Conf extends ContentFlags = { withMarkdown: false; withTypst: false },
+> = ContestDataBase<Conf> & MarkdownContestExt<Conf> & TypstContestExt<Conf>;
+
+export type UILanguageConfig = LanguageConfig & { key: import("crypto").UUID };
+
+export type UIProblemData<Conf extends ContentFlags = { withMarkdown: true }> =
+  ProblemData<Conf> & { key: import("crypto").UUID };
+
+export interface UIImageItem {
+  uuid: string;
+  name: string;
+  url: string; // blob URL for display
 }
 
 export interface EditorImageData {
   uuid: string;
   blob: Blob;
 }
 
+export interface ImmerContestData extends ContestData<{ withMarkdown: true }> {
+  problems: UIProblemData<{ withMarkdown: true }>[];
+  support_languages: UILanguageConfig[];
+  images: UIImageItem[];
+}
+
 export interface StoredContestData extends ContestData<{ withMarkdown: true }> {
   images: {
     uuid: string;
     name: string;
   }[];
 }
 
-export type ContestDataWithImages = Omit<ImmerContestData, "problems" | "support_languages" | "images"> & {
-  images: {
-    uuid: string;
-    name: string;
-    url: string; // blob URL for display (not stored in DB/export)
-  }[];
-  problems: Omit<ImmerContestData["problems"][number], "key">[];
-  support_languages: Omit<ImmerContestData["support_languages"][number], "key">[];
-};
+export type ContestDataWithImages = ContestData<{ withMarkdown: true }> & {
+  images: UIImageItem[];
+};