@xcpcio/core 0.4.1 → 0.4.2

package/dist/index.cjs

@@ -70,81 +70,6 @@ function getTimeDiff(seconds) {
   return [two(h), two(m), two(s)].join(":");
 }
 
-class ContestIndexConfig {
-  constructor() {
-    this.contestName = "";
-    this.startTime = createDayJS();
-    this.endTime = createDayJS();
-    this.freezeTime = createDayJS();
-    this.totalDurationTimestamp = 0;
-    this.freezeDurationTimestamp = 0;
-    this.unFreezeDurationTimestamp = 0;
-  }
-}
-class ContestIndex {
-  constructor() {
-    this.config = new ContestIndexConfig();
-    this.boardLink = "";
-  }
-}
-function createContestIndex(contestIndexJSON) {
-  const c = new ContestIndex();
-  const cc = c.config;
-  const cjc = contestIndexJSON.config;
-  cc.contestName = cjc.contest_name;
-  cc.startTime = createDayJS(cjc.start_time);
-  cc.endTime = createDayJS(cjc.end_time);
-  cc.totalDurationTimestamp = cc.endTime.unix() - cc.startTime.unix();
-  {
-    cc.freezeTime = cc.endTime;
-    cc.freezeDurationTimestamp = 0;
-    if (cjc.frozen_time !== void 0 && cjc.frozen_time != null) {
-      const frozenTime = Number(cjc.frozen_time);
-      cc.freezeTime = createDayJS(cc.endTime.unix() - frozenTime);
-      cc.freezeDurationTimestamp = frozenTime;
-    }
-    cc.unFreezeDurationTimestamp = cc.totalDurationTimestamp - cc.freezeDurationTimestamp;
-  }
-  cc.logo = cjc.logo;
-  c.boardLink = contestIndexJSON.board_link;
-  return c;
-}
-function createContestIndexList(contestListJSON) {
-  const contestIndexList = [];
-  const dfs = (contestList) => {
-    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
-      contestIndexList.push(createContestIndex(contestList));
-    } else {
-      for (const k in contestList) {
-        dfs(contestList[k]);
-      }
-    }
-  };
-  dfs(contestListJSON);
-  contestIndexList.sort((a, b) => {
-    if (a.config.startTime.isBefore(b.config.startTime)) {
-      return 1;
-    }
-    if (a.config.startTime.isAfter(b.config.startTime)) {
-      return -1;
-    }
-    if (a.config.endTime.isBefore(b.config.endTime)) {
-      return 1;
-    }
-    if (a.config.endTime.isAfter(b.config.endTime)) {
-      return -1;
-    }
-    if (a.config.contestName < b.config.contestName) {
-      return 1;
-    }
-    if (a.config.contestName > b.config.contestName) {
-      return -1;
-    }
-    return 0;
-  });
-  return contestIndexList;
-}
-
 class ProblemStatistics {
   constructor() {
     this.acceptedNum = 0;
@@ -272,8 +197,8 @@ class Contest {
   getContestDuration(timeFormat = "HH:mm:ss") {
     return dayjs__default.duration(this.endTime.diff(this.startTime)).format(timeFormat);
   }
-  getContestState() {
-    const now = createDayJS();
+  getContestState(nowTime) {
+    const now = createDayJS(nowTime);
     if (now.isBefore(this.startTime)) {
       return types.ContestState.PENDING;
     }
@@ -285,29 +210,29 @@ class Contest {
     }
     return types.ContestState.RUNNING;
   }
-  getContestPendingTime() {
-    let baseTime = createDayJS();
+  getContestPendingTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.startTime)) {
       baseTime = this.startTime;
     }
     return getTimeDiff(Math.floor(dayjs__default.duration(this.startTime.diff(baseTime)).asSeconds()));
   }
-  getContestRemainingTime(endTime) {
-    let baseTime = dayjs__default();
-    if (baseTime.isAfter(endTime)) {
-      baseTime = endTime;
+  getContestRemainingTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
+    if (baseTime.isAfter(this.endTime)) {
+      baseTime = this.endTime;
     }
-    return getTimeDiff(Math.floor(dayjs__default.duration(endTime.diff(baseTime)).asSeconds()));
+    return getTimeDiff(Math.floor(dayjs__default.duration(this.endTime.diff(baseTime)).asSeconds()));
   }
-  getContestElapsedTime() {
-    let baseTime = dayjs__default();
+  getContestElapsedTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.endTime)) {
       baseTime = this.endTime;
     }
     return getTimeDiff(Math.floor(dayjs__default.duration(baseTime.diff(this.startTime)).asSeconds()));
   }
-  getContestProgressRatio() {
-    const baseTime = dayjs__default();
+  getContestProgressRatio(nowTime) {
+    const baseTime = createDayJS(nowTime);
     if (this.startTime.isSameOrAfter(baseTime)) {
       return 0;
     }
@@ -367,6 +292,66 @@ function createContest(contestJSON) {
   return c;
 }
 
+class ContestIndexConfig {
+  constructor() {
+    this.contestName = "";
+    this.startTime = createDayJS();
+    this.endTime = createDayJS();
+    this.freezeTime = createDayJS();
+    this.totalDurationTimestamp = 0;
+    this.freezeDurationTimestamp = 0;
+    this.unFreezeDurationTimestamp = 0;
+  }
+}
+class ContestIndex {
+  constructor() {
+    this.contest = new Contest();
+    this.boardLink = "";
+  }
+}
+function createContestIndex(contestIndexJSON) {
+  const c = new ContestIndex();
+  const cjc = contestIndexJSON.config;
+  c.contest = createContest(cjc);
+  c.boardLink = contestIndexJSON.board_link;
+  return c;
+}
+function createContestIndexList(contestListJSON) {
+  const contestIndexList = [];
+  const dfs = (contestList) => {
+    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
+      contestIndexList.push(createContestIndex(contestList));
+    } else {
+      for (const k in contestList) {
+        dfs(contestList[k]);
+      }
+    }
+  };
+  dfs(contestListJSON);
+  contestIndexList.sort((a, b) => {
+    if (a.contest.startTime.isBefore(b.contest.startTime)) {
+      return 1;
+    }
+    if (a.contest.startTime.isAfter(b.contest.startTime)) {
+      return -1;
+    }
+    if (a.contest.endTime.isBefore(b.contest.endTime)) {
+      return 1;
+    }
+    if (a.contest.endTime.isAfter(b.contest.endTime)) {
+      return -1;
+    }
+    if (a.contest.name < b.contest.name) {
+      return 1;
+    }
+    if (a.contest.name > b.contest.name) {
+      return -1;
+    }
+    return 0;
+  });
+  return contestIndexList;
+}
+
 function getImageSource(image) {
   if (image?.url) {
     return image.url;

package/dist/index.d.ts

@@ -1,32 +1,6 @@
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
-import { Image, ContestIndex as ContestIndex$1, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, StatusTimeDisplay, ContestState, Contest as Contest$1, Team as Team$1, Teams as Teams$1 } from '@xcpcio/types';
-
-declare class ContestIndexConfig {
-    contestName: string;
-    startTime: dayjs.Dayjs;
-    endTime: dayjs.Dayjs;
-    freezeTime: dayjs.Dayjs;
-    totalDurationTimestamp: number;
-    freezeDurationTimestamp: number;
-    unFreezeDurationTimestamp: number;
-    logo?: Image;
-    constructor();
-}
-declare class ContestIndex {
-    config: ContestIndexConfig;
-    boardLink: string;
-    constructor();
-}
-type ContestIndexList = Array<ContestIndex>;
-declare function createContestIndex(contestIndexJSON: ContestIndex$1): ContestIndex;
-declare function createContestIndexList(contestListJSON: any): ContestIndexList;
-
-declare function calcDict(attemptedNum: number, solvedNum: number): number;
-
-declare function createDayJS(time?: Date | string | number | undefined): dayjs.Dayjs;
-declare function getTimestamp(time: number | dayjs.Dayjs): number;
-declare function getTimeDiff(seconds: number): string;
+import { SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, StatusTimeDisplay, Image, ContestState, Contest as Contest$1, ContestIndex as ContestIndex$1, Team as Team$1, Teams as Teams$1 } from '@xcpcio/types';
 
 declare class Submission {
     id: string;
@@ -96,6 +70,12 @@ declare class TeamProblemStatistics {
     get penalty(): number;
 }
 
+declare function calcDict(attemptedNum: number, solvedNum: number): number;
+
+declare function createDayJS(time?: Date | string | number | undefined): dayjs.Dayjs;
+declare function getTimestamp(time: number | dayjs.Dayjs): number;
+declare function getTimeDiff(seconds: number): string;
+
 declare class Contest {
     name: string;
     startTime: dayjs.Dayjs;
@@ -119,14 +99,34 @@ declare class Contest {
     version: string;
     constructor();
     getContestDuration(timeFormat?: string): string;
-    getContestState(): ContestState;
-    getContestPendingTime(): string;
-    getContestRemainingTime(endTime: dayjs.Dayjs): string;
-    getContestElapsedTime(): string;
-    getContestProgressRatio(): number;
+    getContestState(nowTime?: Date): ContestState;
+    getContestPendingTime(nowTime?: Date): string;
+    getContestRemainingTime(nowTime?: Date): string;
+    getContestElapsedTime(nowTime?: Date): string;
+    getContestProgressRatio(nowTime?: Date): number;
 }
 declare function createContest(contestJSON: Contest$1): Contest;
 
+declare class ContestIndexConfig {
+    contestName: string;
+    startTime: dayjs.Dayjs;
+    endTime: dayjs.Dayjs;
+    freezeTime: dayjs.Dayjs;
+    totalDurationTimestamp: number;
+    freezeDurationTimestamp: number;
+    unFreezeDurationTimestamp: number;
+    logo?: Image;
+    constructor();
+}
+declare class ContestIndex {
+    contest: Contest;
+    boardLink: string;
+    constructor();
+}
+type ContestIndexList = Array<ContestIndex>;
+declare function createContestIndex(contestIndexJSON: ContestIndex$1): ContestIndex;
+declare function createContestIndexList(contestListJSON: any): ContestIndexList;
+
 declare function getImageSource(image: Image): string;
 
 declare class RankStatistics {

package/dist/index.mjs

@@ -54,81 +54,6 @@ function getTimeDiff(seconds) {
   return [two(h), two(m), two(s)].join(":");
 }
 
-class ContestIndexConfig {
-  constructor() {
-    this.contestName = "";
-    this.startTime = createDayJS();
-    this.endTime = createDayJS();
-    this.freezeTime = createDayJS();
-    this.totalDurationTimestamp = 0;
-    this.freezeDurationTimestamp = 0;
-    this.unFreezeDurationTimestamp = 0;
-  }
-}
-class ContestIndex {
-  constructor() {
-    this.config = new ContestIndexConfig();
-    this.boardLink = "";
-  }
-}
-function createContestIndex(contestIndexJSON) {
-  const c = new ContestIndex();
-  const cc = c.config;
-  const cjc = contestIndexJSON.config;
-  cc.contestName = cjc.contest_name;
-  cc.startTime = createDayJS(cjc.start_time);
-  cc.endTime = createDayJS(cjc.end_time);
-  cc.totalDurationTimestamp = cc.endTime.unix() - cc.startTime.unix();
-  {
-    cc.freezeTime = cc.endTime;
-    cc.freezeDurationTimestamp = 0;
-    if (cjc.frozen_time !== void 0 && cjc.frozen_time != null) {
-      const frozenTime = Number(cjc.frozen_time);
-      cc.freezeTime = createDayJS(cc.endTime.unix() - frozenTime);
-      cc.freezeDurationTimestamp = frozenTime;
-    }
-    cc.unFreezeDurationTimestamp = cc.totalDurationTimestamp - cc.freezeDurationTimestamp;
-  }
-  cc.logo = cjc.logo;
-  c.boardLink = contestIndexJSON.board_link;
-  return c;
-}
-function createContestIndexList(contestListJSON) {
-  const contestIndexList = [];
-  const dfs = (contestList) => {
-    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
-      contestIndexList.push(createContestIndex(contestList));
-    } else {
-      for (const k in contestList) {
-        dfs(contestList[k]);
-      }
-    }
-  };
-  dfs(contestListJSON);
-  contestIndexList.sort((a, b) => {
-    if (a.config.startTime.isBefore(b.config.startTime)) {
-      return 1;
-    }
-    if (a.config.startTime.isAfter(b.config.startTime)) {
-      return -1;
-    }
-    if (a.config.endTime.isBefore(b.config.endTime)) {
-      return 1;
-    }
-    if (a.config.endTime.isAfter(b.config.endTime)) {
-      return -1;
-    }
-    if (a.config.contestName < b.config.contestName) {
-      return 1;
-    }
-    if (a.config.contestName > b.config.contestName) {
-      return -1;
-    }
-    return 0;
-  });
-  return contestIndexList;
-}
-
 class ProblemStatistics {
   constructor() {
     this.acceptedNum = 0;
@@ -256,8 +181,8 @@ class Contest {
   getContestDuration(timeFormat = "HH:mm:ss") {
     return dayjs.duration(this.endTime.diff(this.startTime)).format(timeFormat);
   }
-  getContestState() {
-    const now = createDayJS();
+  getContestState(nowTime) {
+    const now = createDayJS(nowTime);
     if (now.isBefore(this.startTime)) {
       return ContestState.PENDING;
     }
@@ -269,29 +194,29 @@ class Contest {
     }
     return ContestState.RUNNING;
   }
-  getContestPendingTime() {
-    let baseTime = createDayJS();
+  getContestPendingTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.startTime)) {
       baseTime = this.startTime;
     }
     return getTimeDiff(Math.floor(dayjs.duration(this.startTime.diff(baseTime)).asSeconds()));
   }
-  getContestRemainingTime(endTime) {
-    let baseTime = dayjs();
-    if (baseTime.isAfter(endTime)) {
-      baseTime = endTime;
+  getContestRemainingTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
+    if (baseTime.isAfter(this.endTime)) {
+      baseTime = this.endTime;
     }
-    return getTimeDiff(Math.floor(dayjs.duration(endTime.diff(baseTime)).asSeconds()));
+    return getTimeDiff(Math.floor(dayjs.duration(this.endTime.diff(baseTime)).asSeconds()));
   }
-  getContestElapsedTime() {
-    let baseTime = dayjs();
+  getContestElapsedTime(nowTime) {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.endTime)) {
       baseTime = this.endTime;
     }
     return getTimeDiff(Math.floor(dayjs.duration(baseTime.diff(this.startTime)).asSeconds()));
   }
-  getContestProgressRatio() {
-    const baseTime = dayjs();
+  getContestProgressRatio(nowTime) {
+    const baseTime = createDayJS(nowTime);
     if (this.startTime.isSameOrAfter(baseTime)) {
       return 0;
     }
@@ -351,6 +276,66 @@ function createContest(contestJSON) {
   return c;
 }
 
+class ContestIndexConfig {
+  constructor() {
+    this.contestName = "";
+    this.startTime = createDayJS();
+    this.endTime = createDayJS();
+    this.freezeTime = createDayJS();
+    this.totalDurationTimestamp = 0;
+    this.freezeDurationTimestamp = 0;
+    this.unFreezeDurationTimestamp = 0;
+  }
+}
+class ContestIndex {
+  constructor() {
+    this.contest = new Contest();
+    this.boardLink = "";
+  }
+}
+function createContestIndex(contestIndexJSON) {
+  const c = new ContestIndex();
+  const cjc = contestIndexJSON.config;
+  c.contest = createContest(cjc);
+  c.boardLink = contestIndexJSON.board_link;
+  return c;
+}
+function createContestIndexList(contestListJSON) {
+  const contestIndexList = [];
+  const dfs = (contestList) => {
+    if (Object.prototype.hasOwnProperty.call(contestList, "config")) {
+      contestIndexList.push(createContestIndex(contestList));
+    } else {
+      for (const k in contestList) {
+        dfs(contestList[k]);
+      }
+    }
+  };
+  dfs(contestListJSON);
+  contestIndexList.sort((a, b) => {
+    if (a.contest.startTime.isBefore(b.contest.startTime)) {
+      return 1;
+    }
+    if (a.contest.startTime.isAfter(b.contest.startTime)) {
+      return -1;
+    }
+    if (a.contest.endTime.isBefore(b.contest.endTime)) {
+      return 1;
+    }
+    if (a.contest.endTime.isAfter(b.contest.endTime)) {
+      return -1;
+    }
+    if (a.contest.name < b.contest.name) {
+      return 1;
+    }
+    if (a.contest.name > b.contest.name) {
+      return -1;
+    }
+    return 0;
+  });
+  return contestIndexList;
+}
+
 function getImageSource(image) {
   if (image?.url) {
     return image.url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xcpcio/core",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "description": "XCPCIO Core",
   "author": "Dup4 <lyuzhi.pan@gmail.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
   "dependencies": {
     "dayjs": "^1.11.8",
     "lodash": "^4.17.21",
-    "@xcpcio/types": "0.4.1"
+    "@xcpcio/types": "0.4.2"
   },
   "devDependencies": {
     "@babel/types": "^7.22.4",

package/src/contest-index.ts

@@ -1,8 +1,9 @@
 import type dayjs from "dayjs";
 
-import type { ContestIndex as IContestIndex, Image } from "@xcpcio/types";
+import type { Contest as IContest, ContestIndex as IContestIndex, Image } from "@xcpcio/types";
 
 import { createDayJS } from "./utils";
+import { Contest, createContest } from "./contest";
 
 export class ContestIndexConfig {
   contestName: string;
@@ -31,11 +32,11 @@ export class ContestIndexConfig {
 }
 
 export class ContestIndex {
-  config: ContestIndexConfig;
+  contest: Contest;
   boardLink: string;
 
   constructor() {
-    this.config = new ContestIndexConfig();
+    this.contest = new Contest();
     this.boardLink = "";
   }
 }
@@ -44,33 +45,9 @@ export type ContestIndexList = Array<ContestIndex>;
 
 export function createContestIndex(contestIndexJSON: IContestIndex): ContestIndex {
   const c = new ContestIndex();
-  const cc = c.config;
   const cjc = contestIndexJSON.config;
 
-  cc.contestName = cjc.contest_name;
-
-  cc.startTime = createDayJS(cjc.start_time);
-  cc.endTime = createDayJS(cjc.end_time);
-
-  cc.totalDurationTimestamp = cc.endTime.unix() - cc.startTime.unix();
-
-  {
-    // default value
-    cc.freezeTime = cc.endTime;
-    cc.freezeDurationTimestamp = 0;
-
-    if (cjc.frozen_time !== undefined && cjc.frozen_time != null) {
-      const frozenTime = Number(cjc.frozen_time);
-
-      cc.freezeTime = createDayJS(cc.endTime.unix() - frozenTime);
-      cc.freezeDurationTimestamp = frozenTime;
-    }
-
-    cc.unFreezeDurationTimestamp = cc.totalDurationTimestamp - cc.freezeDurationTimestamp;
-  }
-
-  cc.logo = cjc.logo;
-
+  c.contest = createContest(cjc as IContest);
   c.boardLink = contestIndexJSON.board_link;
 
   return c;
@@ -92,27 +69,27 @@ export function createContestIndexList(contestListJSON: any): ContestIndexList {
   dfs(contestListJSON);
 
   contestIndexList.sort((a: ContestIndex, b: ContestIndex) => {
-    if (a.config.startTime.isBefore(b.config.startTime)) {
+    if (a.contest.startTime.isBefore(b.contest.startTime)) {
       return 1;
     }
 
-    if (a.config.startTime.isAfter(b.config.startTime)) {
+    if (a.contest.startTime.isAfter(b.contest.startTime)) {
       return -1;
     }
 
-    if (a.config.endTime.isBefore(b.config.endTime)) {
+    if (a.contest.endTime.isBefore(b.contest.endTime)) {
       return 1;
     }
 
-    if (a.config.endTime.isAfter(b.config.endTime)) {
+    if (a.contest.endTime.isAfter(b.contest.endTime)) {
       return -1;
     }
 
-    if (a.config.contestName < b.config.contestName) {
+    if (a.contest.name < b.contest.name) {
       return 1;
     }
 
-    if (a.config.contestName > b.config.contestName) {
+    if (a.contest.name > b.contest.name) {
       return -1;
     }
 

package/src/contest.ts

@@ -62,8 +62,8 @@ export class Contest {
     return dayjs.duration(this.endTime.diff(this.startTime)).format(timeFormat);
   }
 
-  getContestState(): ContestState {
-    const now = createDayJS();
+  getContestState(nowTime?: Date): ContestState {
+    const now = createDayJS(nowTime);
 
     if (now.isBefore(this.startTime)) {
       return ContestState.PENDING;
@@ -80,8 +80,8 @@ export class Contest {
     return ContestState.RUNNING;
   }
 
-  getContestPendingTime(): string {
-    let baseTime = createDayJS();
+  getContestPendingTime(nowTime?: Date): string {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.startTime)) {
       baseTime = this.startTime;
     }
@@ -89,17 +89,17 @@ export class Contest {
     return getTimeDiff(Math.floor(dayjs.duration(this.startTime.diff(baseTime)).asSeconds()));
   }
 
-  getContestRemainingTime(endTime: dayjs.Dayjs): string {
-    let baseTime = dayjs();
-    if (baseTime.isAfter(endTime)) {
-      baseTime = endTime;
+  getContestRemainingTime(nowTime?: Date): string {
+    let baseTime = createDayJS(nowTime);
+    if (baseTime.isAfter(this.endTime)) {
+      baseTime = this.endTime;
     }
 
-    return getTimeDiff(Math.floor(dayjs.duration(endTime.diff(baseTime)).asSeconds()));
+    return getTimeDiff(Math.floor(dayjs.duration(this.endTime.diff(baseTime)).asSeconds()));
   }
 
-  getContestElapsedTime(): string {
-    let baseTime = dayjs();
+  getContestElapsedTime(nowTime?: Date): string {
+    let baseTime = createDayJS(nowTime);
     if (baseTime.isAfter(this.endTime)) {
       baseTime = this.endTime;
     }
@@ -107,8 +107,8 @@ export class Contest {
     return getTimeDiff(Math.floor(dayjs.duration(baseTime.diff(this.startTime)).asSeconds()));
   }
 
-  getContestProgressRatio(): number {
-    const baseTime = dayjs();
+  getContestProgressRatio(nowTime?: Date): number {
+    const baseTime = createDayJS(nowTime);
 
     if (this.startTime.isSameOrAfter(baseTime)) {
       return 0;