@xcpcio/core 0.36.0 → 0.37.0

package/dist/index.cjs

@@ -409,6 +409,8 @@ class GeneralExcelConverter {
   convertToAoa(rank) {
     const aoa = [];
     const enableAwards = rank.contest.isEnableAwards(rank.options.group);
+    const enableMembers = (Array.isArray(rank.teams) && rank.teams[0]?.members) ?? false;
+    const enableCoach = rank.teams[0]?.coach ?? false;
     {
       aoa.push([rank.contest.name]);
     }
@@ -419,10 +421,18 @@ class GeneralExcelConverter {
         head.push(`${rank.contest.organization} Rank`);
         head.push(rank.contest.organization);
       }
-      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
+      head.push("Team", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
         head.push("Medal");
       }
+      if (enableMembers) {
+        head.push("Member1", "Member2", "Member3");
+      }
+      if (enableCoach) {
+        head.push("Coach");
+      }
+      head.push("Unofficial");
+      head.push("Girl");
       aoa.push(head);
     }
     for (const team of rank.teams) {
@@ -456,6 +466,25 @@ class GeneralExcelConverter {
         const medals = team.awards.filter((a) => isValidMedalType(a)).map((a) => a.toString());
         arr.push(medals.join(", "));
       }
+      if (enableMembers) {
+        const members = team.members;
+        if (Array.isArray(members)) {
+          arr.push(members[0] ?? "");
+          arr.push(members[1] ?? "");
+          arr.push(members[2] ?? "");
+        } else {
+          arr.push("", "", "");
+        }
+      }
+      if (enableCoach) {
+        if (typeof team.coach === "string") {
+          arr.push(team.coach ?? "");
+        } else {
+          arr.push("");
+        }
+      }
+      arr.push(team.isUnofficial ? "Y" : "N");
+      arr.push(team.isGirl ? "Y" : "N");
       aoa.push(arr);
     }
     return aoa;
@@ -661,6 +690,26 @@ class Team {
     const solvedNum = this.solvedProblemNum;
     return calcDirt(attemptedNum, solvedNum);
   }
+  get isUnofficial() {
+    return this.group.includes("unofficial");
+  }
+  get isGirl() {
+    return this.group.includes("girl");
+  }
+  get membersToArray() {
+    if (Array.isArray(this.members)) {
+      return this.members;
+    }
+    if (typeof this.members === "string") {
+      if (this.members.includes(", ")) {
+        return this.members.split(", ");
+      }
+      if (this.members.includes("\u3001")) {
+        return this.members.split("\u3001");
+      }
+    }
+    return [];
+  }
   get membersToString() {
     if (typeof this.members === "string") {
       return this.members;

package/dist/index.d.ts

@@ -199,6 +199,9 @@ declare class Team {
     reset(): void;
     get penaltyToMinute(): number;
     get dirt(): number;
+    get isUnofficial(): boolean;
+    get isGirl(): boolean;
+    get membersToArray(): string[];
     get membersToString(): string | undefined;
     get isEffectiveTeam(): boolean;
     calcSolvedData(options: ContestOptions): void;

package/dist/index.mjs

@@ -378,6 +378,8 @@ class GeneralExcelConverter {
   convertToAoa(rank) {
     const aoa = [];
     const enableAwards = rank.contest.isEnableAwards(rank.options.group);
+    const enableMembers = (Array.isArray(rank.teams) && rank.teams[0]?.members) ?? false;
+    const enableCoach = rank.teams[0]?.coach ?? false;
     {
       aoa.push([rank.contest.name]);
     }
@@ -388,10 +390,18 @@ class GeneralExcelConverter {
         head.push(`${rank.contest.organization} Rank`);
         head.push(rank.contest.organization);
       }
-      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
+      head.push("Team", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
         head.push("Medal");
       }
+      if (enableMembers) {
+        head.push("Member1", "Member2", "Member3");
+      }
+      if (enableCoach) {
+        head.push("Coach");
+      }
+      head.push("Unofficial");
+      head.push("Girl");
       aoa.push(head);
     }
     for (const team of rank.teams) {
@@ -425,6 +435,25 @@ class GeneralExcelConverter {
         const medals = team.awards.filter((a) => isValidMedalType(a)).map((a) => a.toString());
         arr.push(medals.join(", "));
       }
+      if (enableMembers) {
+        const members = team.members;
+        if (Array.isArray(members)) {
+          arr.push(members[0] ?? "");
+          arr.push(members[1] ?? "");
+          arr.push(members[2] ?? "");
+        } else {
+          arr.push("", "", "");
+        }
+      }
+      if (enableCoach) {
+        if (typeof team.coach === "string") {
+          arr.push(team.coach ?? "");
+        } else {
+          arr.push("");
+        }
+      }
+      arr.push(team.isUnofficial ? "Y" : "N");
+      arr.push(team.isGirl ? "Y" : "N");
       aoa.push(arr);
     }
     return aoa;
@@ -630,6 +659,26 @@ class Team {
     const solvedNum = this.solvedProblemNum;
     return calcDirt(attemptedNum, solvedNum);
   }
+  get isUnofficial() {
+    return this.group.includes("unofficial");
+  }
+  get isGirl() {
+    return this.group.includes("girl");
+  }
+  get membersToArray() {
+    if (Array.isArray(this.members)) {
+      return this.members;
+    }
+    if (typeof this.members === "string") {
+      if (this.members.includes(", ")) {
+        return this.members.split(", ");
+      }
+      if (this.members.includes("\u3001")) {
+        return this.members.split("\u3001");
+      }
+    }
+    return [];
+  }
   get membersToString() {
     if (typeof this.members === "string") {
       return this.members;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.36.0",
+  "version": "0.37.0",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -46,7 +46,7 @@
     "lodash": "^4.17.21",
     "string-width": "^6.1.0",
     "xlsx-js-style": "^1.2.0",
-    "@xcpcio/types": "0.36.0"
+    "@xcpcio/types": "0.37.0"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/export/general-excel.ts

@@ -110,6 +110,8 @@ export class GeneralExcelConverter {
     const aoa: string[][] = [];
 
     const enableAwards = rank.contest.isEnableAwards(rank.options.group);
+    const enableMembers = (Array.isArray(rank.teams) && rank.teams[0]?.members) ?? false;
+    const enableCoach = rank.teams[0]?.coach ?? false;
 
     {
       aoa.push([rank.contest.name]);
@@ -124,12 +126,23 @@ export class GeneralExcelConverter {
         head.push(rank.contest.organization);
       }
 
-      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map(p => p.label), "Dirt");
+      head.push("Team", "Solved", "Penalty", ...rank.contest.problems.map(p => p.label), "Dirt");
 
       if (enableAwards) {
         head.push("Medal");
       }
 
+      if (enableMembers) {
+        head.push("Member1", "Member2", "Member3");
+      }
+
+      if (enableCoach) {
+        head.push("Coach");
+      }
+
+      head.push("Unofficial");
+      head.push("Girl");
+
       aoa.push(head);
     }
 
@@ -176,6 +189,28 @@ export class GeneralExcelConverter {
         arr.push(medals.join(", "));
       }
 
+      if (enableMembers) {
+        const members = team.members;
+        if (Array.isArray(members)) {
+          arr.push(members[0] ?? "");
+          arr.push(members[1] ?? "");
+          arr.push(members[2] ?? "");
+        } else {
+          arr.push("", "", "");
+        }
+      }
+
+      if (enableCoach) {
+        if (typeof team.coach === "string") {
+          arr.push(team.coach ?? "");
+        } else {
+          arr.push("");
+        }
+      }
+
+      arr.push(team.isUnofficial ? "Y" : "N");
+      arr.push(team.isGirl ? "Y" : "N");
+
       aoa.push(arr);
     }
 

package/src/team.ts

@@ -119,6 +119,32 @@ export class Team {
     return calcDirt(attemptedNum, solvedNum);
   }
 
+  get isUnofficial() {
+    return this.group.includes("unofficial");
+  }
+
+  get isGirl() {
+    return this.group.includes("girl");
+  }
+
+  get membersToArray() {
+    if (Array.isArray(this.members)) {
+      return this.members;
+    }
+
+    if (typeof this.members === "string") {
+      if (this.members.includes(", ")) {
+        return this.members.split(", ");
+      }
+
+      if (this.members.includes("、")) {
+        return this.members.split("、");
+      }
+    }
+
+    return [];
+  }
+
   get membersToString() {
     if (typeof this.members === "string") {
       return this.members;