@xcpcio/core 0.15.0 → 0.17.0

package/dist/index.cjs

@@ -141,6 +141,7 @@ function isPending(status) {
   const pendingArray = [
     types.SubmissionStatus.PENDING,
     types.SubmissionStatus.WAITING,
+    types.SubmissionStatus.COMPILING,
     types.SubmissionStatus.JUDGING,
     types.SubmissionStatus.FROZEN
   ];
@@ -407,7 +408,7 @@ 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), "Dict");
+      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
         head.push("Medal");
       }
@@ -439,7 +440,7 @@ class GeneralExcelConverter {
           arr.push(`? ${p.failedCount} + ${p.pendingCount}`);
         }
       }
-      arr.push(`${team.dict}%`);
+      arr.push(`${team.dirt}%`);
       if (enableAwards) {
         const medals = team.awards.filter((a) => isValidMedalType(a)).map((a) => a.toString());
         arr.push(medals.join(", "));
@@ -450,7 +451,7 @@ class GeneralExcelConverter {
   }
 }
 
-function calcDict(attemptedNum, solvedNum) {
+function calcDirt(attemptedNum, solvedNum) {
   if (solvedNum === 0) {
     return 0;
   }
@@ -478,11 +479,11 @@ class ProblemStatistics {
     this.firstSolveSubmissions = [];
     this.lastSolveSubmissions = [];
   }
-  get dict() {
+  get dirt() {
     if (this.acceptedNum === 0) {
       return 0;
     }
-    return calcDict(this.attemptedNum, this.acceptedNum);
+    return calcDirt(this.attemptedNum, this.acceptedNum);
   }
 }
 class Problem {
@@ -893,10 +894,10 @@ class Team {
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
-  get dict() {
+  get dirt() {
     const attemptedNum = this.attemptedProblemNum;
     const solvedNum = this.solvedProblemNum;
-    return calcDict(attemptedNum, solvedNum);
+    return calcDirt(attemptedNum, solvedNum);
   }
   get membersToString() {
     if (typeof this.members === "string") {
@@ -994,6 +995,9 @@ function createTeam(teamJSON) {
   }
   t.group = [...new Set(t.group)];
   t.group.sort();
+  if (teamJSON.location) {
+    t.location = teamJSON.location;
+  }
   return t;
 }
 function createTeams(teamsJSON) {
@@ -1446,7 +1450,7 @@ exports.Resolver = Resolver;
 exports.Submission = Submission;
 exports.Team = Team;
 exports.TeamProblemStatistics = TeamProblemStatistics;
-exports.calcDict = calcDict;
+exports.calcDirt = calcDirt;
 exports.createContest = createContest;
 exports.createContestIndex = createContestIndex;
 exports.createContestIndexList = createContestIndexList;

package/dist/index.d.ts

@@ -33,7 +33,7 @@ declare class ProblemStatistics {
     lastSolveSubmissions: Submissions;
     constructor();
     reset(): void;
-    get dict(): number;
+    get dirt(): number;
 }
 declare class Problem {
     id: string;
@@ -74,7 +74,7 @@ declare class TeamProblemStatistics {
     get solvedTimestampToMinute(): number;
 }
 
-declare function calcDict(attemptedNum: number, solvedNum: number): number;
+declare function calcDirt(attemptedNum: number, solvedNum: number): number;
 
 declare function createDayJS(time?: Date | string | number | undefined): dayjs.Dayjs;
 declare function getTimestamp(time: number | dayjs.Dayjs): number;
@@ -163,10 +163,11 @@ declare class Team {
     submissions: Submissions;
     placeChartPoints: Array<PlaceChartPointData>;
     awards: MedalType[];
+    location?: string;
     constructor();
     reset(): void;
     get penaltyToMinute(): number;
-    get dict(): number;
+    get dirt(): number;
     get membersToString(): string | undefined;
     calcSolvedData(): void;
     calcAwards(awards?: Award[]): void;
@@ -287,4 +288,4 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Awards, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDict, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Awards, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestIndexList, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Problems, Rank, RankOptions, RankStatistics, Resolver, SelectOptionItem, Submission, Submissions, Team, TeamProblemStatistics, Teams, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/dist/index.mjs

@@ -111,6 +111,7 @@ function isPending(status) {
   const pendingArray = [
     SubmissionStatus.PENDING,
     SubmissionStatus.WAITING,
+    SubmissionStatus.COMPILING,
     SubmissionStatus.JUDGING,
     SubmissionStatus.FROZEN
   ];
@@ -377,7 +378,7 @@ 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), "Dict");
+      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
         head.push("Medal");
       }
@@ -409,7 +410,7 @@ class GeneralExcelConverter {
           arr.push(`? ${p.failedCount} + ${p.pendingCount}`);
         }
       }
-      arr.push(`${team.dict}%`);
+      arr.push(`${team.dirt}%`);
       if (enableAwards) {
         const medals = team.awards.filter((a) => isValidMedalType(a)).map((a) => a.toString());
         arr.push(medals.join(", "));
@@ -420,7 +421,7 @@ class GeneralExcelConverter {
   }
 }
 
-function calcDict(attemptedNum, solvedNum) {
+function calcDirt(attemptedNum, solvedNum) {
   if (solvedNum === 0) {
     return 0;
   }
@@ -448,11 +449,11 @@ class ProblemStatistics {
     this.firstSolveSubmissions = [];
     this.lastSolveSubmissions = [];
   }
-  get dict() {
+  get dirt() {
     if (this.acceptedNum === 0) {
       return 0;
     }
-    return calcDict(this.attemptedNum, this.acceptedNum);
+    return calcDirt(this.attemptedNum, this.acceptedNum);
   }
 }
 class Problem {
@@ -863,10 +864,10 @@ class Team {
   get penaltyToMinute() {
     return Math.floor(this.penalty / 60);
   }
-  get dict() {
+  get dirt() {
     const attemptedNum = this.attemptedProblemNum;
     const solvedNum = this.solvedProblemNum;
-    return calcDict(attemptedNum, solvedNum);
+    return calcDirt(attemptedNum, solvedNum);
   }
   get membersToString() {
     if (typeof this.members === "string") {
@@ -964,6 +965,9 @@ function createTeam(teamJSON) {
   }
   t.group = [...new Set(t.group)];
   t.group.sort();
+  if (teamJSON.location) {
+    t.location = teamJSON.location;
+  }
   return t;
 }
 function createTeams(teamsJSON) {
@@ -1398,4 +1402,4 @@ class Resolver extends Rank {
   }
 }
 
-export { Award, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDict, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, GeneralExcelConverter, MedalType, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Resolver, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/package.json

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

package/src/export/general-excel.ts

@@ -124,7 +124,7 @@ export class GeneralExcelConverter {
         head.push(rank.contest.organization);
       }
 
-      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map(p => p.label), "Dict");
+      head.push("Name", "Solved", "Penalty", ...rank.contest.problems.map(p => p.label), "Dirt");
 
       if (enableAwards) {
         head.push("Medal");
@@ -167,7 +167,7 @@ export class GeneralExcelConverter {
         }
       }
 
-      arr.push(`${team.dict}%`);
+      arr.push(`${team.dirt}%`);
 
       if (enableAwards) {
         const medals = team.awards

package/src/problem.ts

@@ -1,7 +1,7 @@
 import type { BalloonColor, Problem as IProblem, Problems as IProblems } from "@xcpcio/types";
 
 import type { Submissions } from "./submission";
-import { calcDict } from "./utils";
+import { calcDirt } from "./utils";
 
 export class ProblemStatistics {
   acceptedNum: number;
@@ -41,12 +41,12 @@ export class ProblemStatistics {
     this.lastSolveSubmissions = [];
   }
 
-  get dict() {
+  get dirt() {
     if (this.acceptedNum === 0) {
       return 0;
     }
 
-    return calcDict(this.attemptedNum, this.acceptedNum);
+    return calcDirt(this.attemptedNum, this.acceptedNum);
   }
 }
 

package/src/submission-status.ts

@@ -128,6 +128,7 @@ export function isPending(status: SubmissionStatus): boolean {
   const pendingArray = [
     SubmissionStatus.PENDING,
     SubmissionStatus.WAITING,
+    SubmissionStatus.COMPILING,
     SubmissionStatus.JUDGING,
     SubmissionStatus.FROZEN,
   ];

package/src/team.ts

@@ -1,7 +1,7 @@
 import type { Team as ITeam, Teams as ITeams, Image } from "@xcpcio/types";
 
 import type { Problem, TeamProblemStatistics } from "./problem";
-import { calcDict } from "./utils";
+import { calcDirt } from "./utils";
 import type { Submissions } from "./submission";
 import type { Award, MedalType } from "./award";
 
@@ -51,6 +51,8 @@ export class Team {
 
   awards: MedalType[];
 
+  location?: string;
+
   constructor() {
     this.id = "";
     this.name = "";
@@ -109,11 +111,11 @@ export class Team {
     return Math.floor(this.penalty / 60);
   }
 
-  get dict() {
+  get dirt() {
     const attemptedNum = this.attemptedProblemNum;
     const solvedNum = this.solvedProblemNum;
 
-    return calcDict(attemptedNum, solvedNum);
+    return calcDirt(attemptedNum, solvedNum);
   }
 
   get membersToString() {
@@ -244,6 +246,10 @@ export function createTeam(teamJSON: ITeam): Team {
   t.group = [...new Set(t.group)];
   t.group.sort();
 
+  if (teamJSON.location) {
+    t.location = teamJSON.location;
+  }
+
   return t;
 }
 

package/src/utils/calc.ts

@@ -1,4 +1,4 @@
-export function calcDict(attemptedNum: number, solvedNum: number) {
+export function calcDirt(attemptedNum: number, solvedNum: number) {
   if (solvedNum === 0) {
     return 0;
   }