@xcpcio/core 0.78.7 → 0.79.1

package/dist/index.cjs

@@ -1053,6 +1053,7 @@ class BattleOfGiants {
 }
 
 class ContestOptions {
+  enableOrganization;
   calculationOfPenalty;
   submissionTimestampUnit;
   submissionHasTimeField;
@@ -1066,6 +1067,7 @@ class ContestOptions {
   teamWebcamStreamUrlTemplate;
   teamScreenStreamUrlTemplate;
   constructor() {
+    this.enableOrganization = false;
     this.calculationOfPenalty = "in_minutes";
     this.submissionTimestampUnit = "second";
     this.submissionHasTimeField = false;
@@ -1078,6 +1080,7 @@ class ContestOptions {
 function createContestOptions(contestOptionsJSON = {}) {
   const j = contestOptionsJSON;
   const o = new ContestOptions();
+  o.enableOrganization = !!j.enable_organization;
   if (j.calculation_of_penalty) {
     o.calculationOfPenalty = j.calculation_of_penalty;
   }
@@ -1108,6 +1111,44 @@ class Group {
   }
 }
 
+class Organization {
+  id;
+  name;
+  logo;
+  icpcID;
+  // Teams belonging to this organization
+  teams;
+  rank;
+  constructor() {
+    this.id = "";
+    this.name = new I18nText();
+    this.teams = [];
+    this.rank = -1;
+  }
+  reset() {
+    this.rank = -1;
+  }
+  static compare(lhs, rhs) {
+    if (lhs.id < rhs.id) {
+      return -1;
+    } else if (lhs.id > rhs.id) {
+      return 1;
+    }
+    return 0;
+  }
+}
+function createOrganization(orgJSON) {
+  const org = new Organization();
+  org.id = orgJSON.id;
+  org.name = I18nText.fromIText(orgJSON.name);
+  org.logo = orgJSON.logo;
+  org.icpcID = orgJSON.icpc_id;
+  return org;
+}
+function createOrganizations(orgsJSON) {
+  return orgsJSON.map((org) => createOrganization(org));
+}
+
 class Contest {
   id = "";
   name;
@@ -1126,7 +1167,6 @@ class Contest {
   problems;
   problemsMap;
   statusTimeDisplay;
-  badge;
   organization;
   medal;
   awards;
@@ -1137,6 +1177,7 @@ class Contest {
   bannerMode;
   boardLink;
   options;
+  organizations;
   constructor() {
     this.name = new I18nText();
     this.startTime = createDayJS();
@@ -1288,7 +1329,6 @@ function createContest(contestJSON) {
       pending: Boolean(contestJSON.status_time_display.pending ?? false)
     };
   }
-  c.badge = contestJSON.badge;
   c.organization = contestJSON.organization;
   c.medal = contestJSON.medal;
   (() => {
@@ -1361,6 +1401,12 @@ function createContest(contestJSON) {
   if (contestJSON.options) {
     c.options = createContestOptions(contestJSON.options);
   }
+  if (c.organization) {
+    c.options.enableOrganization = true;
+  }
+  if (contestJSON.organizations) {
+    c.organizations = createOrganizations(contestJSON.organizations);
+  }
   return c;
 }
 
@@ -1638,9 +1684,9 @@ class GeneralExcelConverter {
     {
       const head = [];
       head.push("Rank");
-      if (rank.contest.organization) {
-        head.push(`${rank.contest.organization} Rank`);
-        head.push(rank.contest.organization);
+      if (rank.contest.options.enableOrganization) {
+        head.push("Organization Rank");
+        head.push("Organization");
       }
       head.push("Team", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
@@ -1781,49 +1827,14 @@ function getImageSource(image, data_host) {
     return `${normalizePath(data_host)}${image.url}`;
   }
   if (image?.base64) {
+    if (image.mime) {
+      return `data:${image.mime};base64,${image.base64}`;
+    }
     return `data:image/${image.type ?? "png"};base64,${image.base64}`;
   }
   return "";
 }
 
-class Organization {
-  id;
-  name;
-  logo;
-  icpcID;
-  // Teams belonging to this organization
-  teams;
-  rank;
-  constructor() {
-    this.id = "";
-    this.name = new I18nText();
-    this.teams = [];
-    this.rank = -1;
-  }
-  reset() {
-    this.rank = -1;
-  }
-  static compare(lhs, rhs) {
-    if (lhs.id < rhs.id) {
-      return -1;
-    } else if (lhs.id > rhs.id) {
-      return 1;
-    }
-    return 0;
-  }
-}
-function createOrganization(orgJSON) {
-  const org = new Organization();
-  org.id = orgJSON.id;
-  org.name = I18nText.fromIText(orgJSON.name);
-  org.logo = orgJSON.logo;
-  org.icpcID = orgJSON.icpc_id;
-  return org;
-}
-function createOrganizations(orgsJSON) {
-  return orgsJSON.map((org) => createOrganization(org));
-}
-
 class RankStatistics {
   teamSolvedNum;
   teamSolvedNumIndex;
@@ -1974,8 +1985,16 @@ class Rank {
       });
     }
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.organizationsMap = this.buildOrganizationsMap();
-    this.organizations = [...this.organizationsMap.values()];
+    if (this.contest.organizations) {
+      this.organizations = this.contest.organizations;
+      this.organizationsMap = new Map(
+        this.organizations.map((org) => [org.id, org])
+      );
+      this.linkTeamAndOrg();
+    } else {
+      this.organizationsMap = this.buildOrganizationsMap();
+      this.organizations = [...this.organizationsMap.values()];
+    }
     this.organizations.sort(Organization.compare);
     this.originTeams = this.teams.map((t) => t);
     this.originTeams.sort(Team.compare);
@@ -1999,8 +2018,16 @@ class Rank {
       this.statuses = [...se].sort();
     }
   }
+  linkTeamAndOrg() {
+    this.teams.forEach((t) => {
+      if (!t.organizationId) {
+        return;
+      }
+      t.organization = this.organizationsMap.get(t.organizationId);
+    });
+  }
   buildOrganizationsMap() {
-    if (!this.contest.organization) {
+    if (!this.contest.options.enableOrganization) {
       return /* @__PURE__ */ new Map();
     }
     const res = /* @__PURE__ */ new Map();
@@ -2186,7 +2213,7 @@ class Rank {
     }
   }
   buildOrgRank() {
-    if (!this.contest.organization) {
+    if (!this.contest.options.enableOrganization) {
       return;
     }
     let rank = 1;

package/dist/index.d.cts

@@ -1,4 +1,4 @@
-import { Lang, I18NStringSet, Text, CalculationOfPenalty, TimeUnit, Image, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Organization as Organization$1, Organizations as Organizations$1, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
+import { CalculationOfPenalty, TimeUnit, Image, Lang, I18NStringSet, Text, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, Organization as Organization$1, Organizations as Organizations$1, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -19,6 +19,23 @@ declare class Award {
 declare function isValidMedalType(medal: MedalType): boolean;
 type Awards = Map<string, Award[]>;
 
+declare class ContestOptions {
+    enableOrganization: boolean;
+    calculationOfPenalty: CalculationOfPenalty;
+    submissionTimestampUnit: TimeUnit;
+    submissionHasTimeField: boolean;
+    submissionHasLanguageField: boolean;
+    submissionEnableActionField: boolean;
+    submissionHasReactionField: boolean;
+    submissionHasExternalUrlField: boolean;
+    reactionVideoUrlTemplate?: string;
+    submissionExternalUrlTemplate?: string;
+    teamPhotoTemplate?: Image;
+    teamWebcamStreamUrlTemplate?: string;
+    teamScreenStreamUrlTemplate?: string;
+    constructor();
+}
+
 interface SelectOptionItem {
     value: string;
     text: string;
@@ -38,21 +55,87 @@ declare class I18nText {
     valueOf(): string;
 }
 
-declare class ContestOptions {
-    calculationOfPenalty: CalculationOfPenalty;
-    submissionTimestampUnit: TimeUnit;
-    submissionHasTimeField: boolean;
-    submissionHasLanguageField: boolean;
-    submissionEnableActionField: boolean;
-    submissionHasReactionField: boolean;
-    submissionHasExternalUrlField: boolean;
-    reactionVideoUrlTemplate?: string;
-    submissionExternalUrlTemplate?: string;
-    teamPhotoTemplate?: Image;
-    teamWebcamStreamUrlTemplate?: string;
-    teamScreenStreamUrlTemplate?: string;
+declare class Person {
+    name: I18nText;
+    cfID?: string;
+    icpcID?: string;
+    constructor(name?: I18nText);
+    toIPerson(): Person$1;
+    static fromIPerson(iPerson: Person$1): Person;
+}
+type Persons = Array<Person>;
+declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
+
+declare class PlaceChartPointData {
+    timePoint: number;
+    rank: number;
+    lastSolvedProblem: Problem | null;
+    constructor();
+}
+declare class Team {
+    id: string;
+    name: I18nText;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
+    group: Array<string>;
+    tag: Array<string>;
+    coaches: Persons;
+    members: Persons;
+    rank: number;
+    originalRank: number;
+    solvedProblemNum: number;
+    attemptedProblemNum: number;
+    lastSolvedProblem: Problem | null;
+    lastSolvedProblemStatistics: TeamProblemStatistics | null;
+    penalty: number;
+    problemStatistics: Array<TeamProblemStatistics>;
+    problemStatisticsMap: Map<string, TeamProblemStatistics>;
+    submissions: Submissions;
+    placeChartPoints: Array<PlaceChartPointData>;
+    awards: MedalType[];
+    badge?: Image;
+    missingPhoto: boolean;
+    photo?: Image;
+    location?: string;
+    icpcID?: string;
+    ip?: string;
+    se: number;
+    constructor();
+    reset(): void;
+    get penaltyToMinute(): number;
+    get isUnofficial(): boolean;
+    get isGirl(): boolean;
+    get isEffectiveTeam(): boolean;
+    get dirt(): number;
+    membersToString(lang?: Lang): string;
+    coachesToString(lang?: Lang): string;
+    calcSE(totalTeams: number): number;
+    calcSolvedData(options: ContestOptions): void;
+    calcAwards(awards?: Award[]): void;
+    isEqualRank(otherTeam: Team): boolean;
+    postProcessPlaceChartPoints(): void;
+    static compare(lhs: Team, rhs: Team): number;
+}
+type Teams = Array<Team>;
+declare function createTeam(teamJSON: Team$1): Team;
+declare function createTeams(teamsJSON: Teams$1): Teams;
+
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    icpcID?: string;
+    teams: Teams;
+    rank: number;
     constructor();
+    reset(): void;
+    static compare(lhs: Organization, rhs: Organization): number;
 }
+type Organizations = Array<Organization>;
+declare function createOrganization(orgJSON: Organization$1): Organization;
+declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
 
 declare class Group {
     name: I18nText;
@@ -89,7 +172,6 @@ declare class Contest {
     problems: Problems;
     problemsMap: Map<string, Problem>;
     statusTimeDisplay: StatusTimeDisplay;
-    badge?: string;
     organization?: string;
     medal?: Record<string, Record<string, number>> | MedalPreset;
     awards?: Awards;
@@ -100,6 +182,7 @@ declare class Contest {
     bannerMode?: BannerMode;
     boardLink?: string;
     options: ContestOptions;
+    organizations?: Organizations;
     constructor();
     getStartTime(): dayjs.Dayjs;
     getEndTime(): dayjs.Dayjs;
@@ -200,88 +283,6 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
-declare class Organization {
-    id: string;
-    name: I18nText;
-    logo?: Image;
-    icpcID?: string;
-    teams: Teams;
-    rank: number;
-    constructor();
-    reset(): void;
-    static compare(lhs: Organization, rhs: Organization): number;
-}
-type Organizations = Array<Organization>;
-declare function createOrganization(orgJSON: Organization$1): Organization;
-declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
-
-declare class Person {
-    name: I18nText;
-    cfID?: string;
-    icpcID?: string;
-    constructor(name?: I18nText);
-    toIPerson(): Person$1;
-    static fromIPerson(iPerson: Person$1): Person;
-}
-type Persons = Array<Person>;
-declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
-
-declare class PlaceChartPointData {
-    timePoint: number;
-    rank: number;
-    lastSolvedProblem: Problem | null;
-    constructor();
-}
-declare class Team {
-    id: string;
-    name: I18nText;
-    organizationId?: string;
-    organizationName?: string;
-    organization?: Organization;
-    isFirstRankOfOrganization: boolean;
-    group: Array<string>;
-    tag: Array<string>;
-    coaches: Persons;
-    members: Persons;
-    rank: number;
-    originalRank: number;
-    solvedProblemNum: number;
-    attemptedProblemNum: number;
-    lastSolvedProblem: Problem | null;
-    lastSolvedProblemStatistics: TeamProblemStatistics | null;
-    penalty: number;
-    problemStatistics: Array<TeamProblemStatistics>;
-    problemStatisticsMap: Map<string, TeamProblemStatistics>;
-    submissions: Submissions;
-    placeChartPoints: Array<PlaceChartPointData>;
-    awards: MedalType[];
-    badge?: Image;
-    missingPhoto: boolean;
-    photo?: Image;
-    location?: string;
-    icpcID?: string;
-    ip?: string;
-    se: number;
-    constructor();
-    reset(): void;
-    get penaltyToMinute(): number;
-    get isUnofficial(): boolean;
-    get isGirl(): boolean;
-    get isEffectiveTeam(): boolean;
-    get dirt(): number;
-    membersToString(lang?: Lang): string;
-    coachesToString(lang?: Lang): string;
-    calcSE(totalTeams: number): number;
-    calcSolvedData(options: ContestOptions): void;
-    calcAwards(awards?: Award[]): void;
-    isEqualRank(otherTeam: Team): boolean;
-    postProcessPlaceChartPoints(): void;
-    static compare(lhs: Team, rhs: Team): number;
-}
-type Teams = Array<Team>;
-declare function createTeam(teamJSON: Team$1): Team;
-declare function createTeams(teamsJSON: Teams$1): Teams;
-
 declare class Balloon {
     problem: Problem;
     team: Team;
@@ -398,6 +399,7 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    linkTeamAndOrg(): void;
     buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;

package/dist/index.d.mts

@@ -1,4 +1,4 @@
-import { Lang, I18NStringSet, Text, CalculationOfPenalty, TimeUnit, Image, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Organization as Organization$1, Organizations as Organizations$1, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
+import { CalculationOfPenalty, TimeUnit, Image, Lang, I18NStringSet, Text, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, Organization as Organization$1, Organizations as Organizations$1, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -19,6 +19,23 @@ declare class Award {
 declare function isValidMedalType(medal: MedalType): boolean;
 type Awards = Map<string, Award[]>;
 
+declare class ContestOptions {
+    enableOrganization: boolean;
+    calculationOfPenalty: CalculationOfPenalty;
+    submissionTimestampUnit: TimeUnit;
+    submissionHasTimeField: boolean;
+    submissionHasLanguageField: boolean;
+    submissionEnableActionField: boolean;
+    submissionHasReactionField: boolean;
+    submissionHasExternalUrlField: boolean;
+    reactionVideoUrlTemplate?: string;
+    submissionExternalUrlTemplate?: string;
+    teamPhotoTemplate?: Image;
+    teamWebcamStreamUrlTemplate?: string;
+    teamScreenStreamUrlTemplate?: string;
+    constructor();
+}
+
 interface SelectOptionItem {
     value: string;
     text: string;
@@ -38,21 +55,87 @@ declare class I18nText {
     valueOf(): string;
 }
 
-declare class ContestOptions {
-    calculationOfPenalty: CalculationOfPenalty;
-    submissionTimestampUnit: TimeUnit;
-    submissionHasTimeField: boolean;
-    submissionHasLanguageField: boolean;
-    submissionEnableActionField: boolean;
-    submissionHasReactionField: boolean;
-    submissionHasExternalUrlField: boolean;
-    reactionVideoUrlTemplate?: string;
-    submissionExternalUrlTemplate?: string;
-    teamPhotoTemplate?: Image;
-    teamWebcamStreamUrlTemplate?: string;
-    teamScreenStreamUrlTemplate?: string;
+declare class Person {
+    name: I18nText;
+    cfID?: string;
+    icpcID?: string;
+    constructor(name?: I18nText);
+    toIPerson(): Person$1;
+    static fromIPerson(iPerson: Person$1): Person;
+}
+type Persons = Array<Person>;
+declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
+
+declare class PlaceChartPointData {
+    timePoint: number;
+    rank: number;
+    lastSolvedProblem: Problem | null;
+    constructor();
+}
+declare class Team {
+    id: string;
+    name: I18nText;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
+    group: Array<string>;
+    tag: Array<string>;
+    coaches: Persons;
+    members: Persons;
+    rank: number;
+    originalRank: number;
+    solvedProblemNum: number;
+    attemptedProblemNum: number;
+    lastSolvedProblem: Problem | null;
+    lastSolvedProblemStatistics: TeamProblemStatistics | null;
+    penalty: number;
+    problemStatistics: Array<TeamProblemStatistics>;
+    problemStatisticsMap: Map<string, TeamProblemStatistics>;
+    submissions: Submissions;
+    placeChartPoints: Array<PlaceChartPointData>;
+    awards: MedalType[];
+    badge?: Image;
+    missingPhoto: boolean;
+    photo?: Image;
+    location?: string;
+    icpcID?: string;
+    ip?: string;
+    se: number;
+    constructor();
+    reset(): void;
+    get penaltyToMinute(): number;
+    get isUnofficial(): boolean;
+    get isGirl(): boolean;
+    get isEffectiveTeam(): boolean;
+    get dirt(): number;
+    membersToString(lang?: Lang): string;
+    coachesToString(lang?: Lang): string;
+    calcSE(totalTeams: number): number;
+    calcSolvedData(options: ContestOptions): void;
+    calcAwards(awards?: Award[]): void;
+    isEqualRank(otherTeam: Team): boolean;
+    postProcessPlaceChartPoints(): void;
+    static compare(lhs: Team, rhs: Team): number;
+}
+type Teams = Array<Team>;
+declare function createTeam(teamJSON: Team$1): Team;
+declare function createTeams(teamsJSON: Teams$1): Teams;
+
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    icpcID?: string;
+    teams: Teams;
+    rank: number;
     constructor();
+    reset(): void;
+    static compare(lhs: Organization, rhs: Organization): number;
 }
+type Organizations = Array<Organization>;
+declare function createOrganization(orgJSON: Organization$1): Organization;
+declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
 
 declare class Group {
     name: I18nText;
@@ -89,7 +172,6 @@ declare class Contest {
     problems: Problems;
     problemsMap: Map<string, Problem>;
     statusTimeDisplay: StatusTimeDisplay;
-    badge?: string;
     organization?: string;
     medal?: Record<string, Record<string, number>> | MedalPreset;
     awards?: Awards;
@@ -100,6 +182,7 @@ declare class Contest {
     bannerMode?: BannerMode;
     boardLink?: string;
     options: ContestOptions;
+    organizations?: Organizations;
     constructor();
     getStartTime(): dayjs.Dayjs;
     getEndTime(): dayjs.Dayjs;
@@ -200,88 +283,6 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
-declare class Organization {
-    id: string;
-    name: I18nText;
-    logo?: Image;
-    icpcID?: string;
-    teams: Teams;
-    rank: number;
-    constructor();
-    reset(): void;
-    static compare(lhs: Organization, rhs: Organization): number;
-}
-type Organizations = Array<Organization>;
-declare function createOrganization(orgJSON: Organization$1): Organization;
-declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
-
-declare class Person {
-    name: I18nText;
-    cfID?: string;
-    icpcID?: string;
-    constructor(name?: I18nText);
-    toIPerson(): Person$1;
-    static fromIPerson(iPerson: Person$1): Person;
-}
-type Persons = Array<Person>;
-declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
-
-declare class PlaceChartPointData {
-    timePoint: number;
-    rank: number;
-    lastSolvedProblem: Problem | null;
-    constructor();
-}
-declare class Team {
-    id: string;
-    name: I18nText;
-    organizationId?: string;
-    organizationName?: string;
-    organization?: Organization;
-    isFirstRankOfOrganization: boolean;
-    group: Array<string>;
-    tag: Array<string>;
-    coaches: Persons;
-    members: Persons;
-    rank: number;
-    originalRank: number;
-    solvedProblemNum: number;
-    attemptedProblemNum: number;
-    lastSolvedProblem: Problem | null;
-    lastSolvedProblemStatistics: TeamProblemStatistics | null;
-    penalty: number;
-    problemStatistics: Array<TeamProblemStatistics>;
-    problemStatisticsMap: Map<string, TeamProblemStatistics>;
-    submissions: Submissions;
-    placeChartPoints: Array<PlaceChartPointData>;
-    awards: MedalType[];
-    badge?: Image;
-    missingPhoto: boolean;
-    photo?: Image;
-    location?: string;
-    icpcID?: string;
-    ip?: string;
-    se: number;
-    constructor();
-    reset(): void;
-    get penaltyToMinute(): number;
-    get isUnofficial(): boolean;
-    get isGirl(): boolean;
-    get isEffectiveTeam(): boolean;
-    get dirt(): number;
-    membersToString(lang?: Lang): string;
-    coachesToString(lang?: Lang): string;
-    calcSE(totalTeams: number): number;
-    calcSolvedData(options: ContestOptions): void;
-    calcAwards(awards?: Award[]): void;
-    isEqualRank(otherTeam: Team): boolean;
-    postProcessPlaceChartPoints(): void;
-    static compare(lhs: Team, rhs: Team): number;
-}
-type Teams = Array<Team>;
-declare function createTeam(teamJSON: Team$1): Team;
-declare function createTeams(teamsJSON: Teams$1): Teams;
-
 declare class Balloon {
     problem: Problem;
     team: Team;
@@ -398,6 +399,7 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    linkTeamAndOrg(): void;
     buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-import { Lang, I18NStringSet, Text, CalculationOfPenalty, TimeUnit, Image, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, Organization as Organization$1, Organizations as Organizations$1, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
+import { CalculationOfPenalty, TimeUnit, Image, Lang, I18NStringSet, Text, Person as Person$1, Persons as Persons$1, Team as Team$1, Teams as Teams$1, Organization as Organization$1, Organizations as Organizations$1, StatusTimeDisplay, MedalPreset, BannerMode, ContestState, Contest as Contest$1, SubmissionReaction, SubmissionStatus, Submission as Submission$1, Submissions as Submissions$1, BalloonColor, Problem as Problem$1, Problems as Problems$1, ContestIndex as ContestIndex$1, IRatingHistory, IRatingUser, IRating } from '@xcpcio/types';
 import dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -19,6 +19,23 @@ declare class Award {
 declare function isValidMedalType(medal: MedalType): boolean;
 type Awards = Map<string, Award[]>;
 
+declare class ContestOptions {
+    enableOrganization: boolean;
+    calculationOfPenalty: CalculationOfPenalty;
+    submissionTimestampUnit: TimeUnit;
+    submissionHasTimeField: boolean;
+    submissionHasLanguageField: boolean;
+    submissionEnableActionField: boolean;
+    submissionHasReactionField: boolean;
+    submissionHasExternalUrlField: boolean;
+    reactionVideoUrlTemplate?: string;
+    submissionExternalUrlTemplate?: string;
+    teamPhotoTemplate?: Image;
+    teamWebcamStreamUrlTemplate?: string;
+    teamScreenStreamUrlTemplate?: string;
+    constructor();
+}
+
 interface SelectOptionItem {
     value: string;
     text: string;
@@ -38,21 +55,87 @@ declare class I18nText {
     valueOf(): string;
 }
 
-declare class ContestOptions {
-    calculationOfPenalty: CalculationOfPenalty;
-    submissionTimestampUnit: TimeUnit;
-    submissionHasTimeField: boolean;
-    submissionHasLanguageField: boolean;
-    submissionEnableActionField: boolean;
-    submissionHasReactionField: boolean;
-    submissionHasExternalUrlField: boolean;
-    reactionVideoUrlTemplate?: string;
-    submissionExternalUrlTemplate?: string;
-    teamPhotoTemplate?: Image;
-    teamWebcamStreamUrlTemplate?: string;
-    teamScreenStreamUrlTemplate?: string;
+declare class Person {
+    name: I18nText;
+    cfID?: string;
+    icpcID?: string;
+    constructor(name?: I18nText);
+    toIPerson(): Person$1;
+    static fromIPerson(iPerson: Person$1): Person;
+}
+type Persons = Array<Person>;
+declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
+
+declare class PlaceChartPointData {
+    timePoint: number;
+    rank: number;
+    lastSolvedProblem: Problem | null;
+    constructor();
+}
+declare class Team {
+    id: string;
+    name: I18nText;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
+    group: Array<string>;
+    tag: Array<string>;
+    coaches: Persons;
+    members: Persons;
+    rank: number;
+    originalRank: number;
+    solvedProblemNum: number;
+    attemptedProblemNum: number;
+    lastSolvedProblem: Problem | null;
+    lastSolvedProblemStatistics: TeamProblemStatistics | null;
+    penalty: number;
+    problemStatistics: Array<TeamProblemStatistics>;
+    problemStatisticsMap: Map<string, TeamProblemStatistics>;
+    submissions: Submissions;
+    placeChartPoints: Array<PlaceChartPointData>;
+    awards: MedalType[];
+    badge?: Image;
+    missingPhoto: boolean;
+    photo?: Image;
+    location?: string;
+    icpcID?: string;
+    ip?: string;
+    se: number;
+    constructor();
+    reset(): void;
+    get penaltyToMinute(): number;
+    get isUnofficial(): boolean;
+    get isGirl(): boolean;
+    get isEffectiveTeam(): boolean;
+    get dirt(): number;
+    membersToString(lang?: Lang): string;
+    coachesToString(lang?: Lang): string;
+    calcSE(totalTeams: number): number;
+    calcSolvedData(options: ContestOptions): void;
+    calcAwards(awards?: Award[]): void;
+    isEqualRank(otherTeam: Team): boolean;
+    postProcessPlaceChartPoints(): void;
+    static compare(lhs: Team, rhs: Team): number;
+}
+type Teams = Array<Team>;
+declare function createTeam(teamJSON: Team$1): Team;
+declare function createTeams(teamsJSON: Teams$1): Teams;
+
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    icpcID?: string;
+    teams: Teams;
+    rank: number;
     constructor();
+    reset(): void;
+    static compare(lhs: Organization, rhs: Organization): number;
 }
+type Organizations = Array<Organization>;
+declare function createOrganization(orgJSON: Organization$1): Organization;
+declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
 
 declare class Group {
     name: I18nText;
@@ -89,7 +172,6 @@ declare class Contest {
     problems: Problems;
     problemsMap: Map<string, Problem>;
     statusTimeDisplay: StatusTimeDisplay;
-    badge?: string;
     organization?: string;
     medal?: Record<string, Record<string, number>> | MedalPreset;
     awards?: Awards;
@@ -100,6 +182,7 @@ declare class Contest {
     bannerMode?: BannerMode;
     boardLink?: string;
     options: ContestOptions;
+    organizations?: Organizations;
     constructor();
     getStartTime(): dayjs.Dayjs;
     getEndTime(): dayjs.Dayjs;
@@ -200,88 +283,6 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
-declare class Organization {
-    id: string;
-    name: I18nText;
-    logo?: Image;
-    icpcID?: string;
-    teams: Teams;
-    rank: number;
-    constructor();
-    reset(): void;
-    static compare(lhs: Organization, rhs: Organization): number;
-}
-type Organizations = Array<Organization>;
-declare function createOrganization(orgJSON: Organization$1): Organization;
-declare function createOrganizations(orgsJSON: Organizations$1): Organizations;
-
-declare class Person {
-    name: I18nText;
-    cfID?: string;
-    icpcID?: string;
-    constructor(name?: I18nText);
-    toIPerson(): Person$1;
-    static fromIPerson(iPerson: Person$1): Person;
-}
-type Persons = Array<Person>;
-declare function createPersons(iPersons?: Text | Array<Text> | Persons$1): Persons;
-
-declare class PlaceChartPointData {
-    timePoint: number;
-    rank: number;
-    lastSolvedProblem: Problem | null;
-    constructor();
-}
-declare class Team {
-    id: string;
-    name: I18nText;
-    organizationId?: string;
-    organizationName?: string;
-    organization?: Organization;
-    isFirstRankOfOrganization: boolean;
-    group: Array<string>;
-    tag: Array<string>;
-    coaches: Persons;
-    members: Persons;
-    rank: number;
-    originalRank: number;
-    solvedProblemNum: number;
-    attemptedProblemNum: number;
-    lastSolvedProblem: Problem | null;
-    lastSolvedProblemStatistics: TeamProblemStatistics | null;
-    penalty: number;
-    problemStatistics: Array<TeamProblemStatistics>;
-    problemStatisticsMap: Map<string, TeamProblemStatistics>;
-    submissions: Submissions;
-    placeChartPoints: Array<PlaceChartPointData>;
-    awards: MedalType[];
-    badge?: Image;
-    missingPhoto: boolean;
-    photo?: Image;
-    location?: string;
-    icpcID?: string;
-    ip?: string;
-    se: number;
-    constructor();
-    reset(): void;
-    get penaltyToMinute(): number;
-    get isUnofficial(): boolean;
-    get isGirl(): boolean;
-    get isEffectiveTeam(): boolean;
-    get dirt(): number;
-    membersToString(lang?: Lang): string;
-    coachesToString(lang?: Lang): string;
-    calcSE(totalTeams: number): number;
-    calcSolvedData(options: ContestOptions): void;
-    calcAwards(awards?: Award[]): void;
-    isEqualRank(otherTeam: Team): boolean;
-    postProcessPlaceChartPoints(): void;
-    static compare(lhs: Team, rhs: Team): number;
-}
-type Teams = Array<Team>;
-declare function createTeam(teamJSON: Team$1): Team;
-declare function createTeams(teamsJSON: Teams$1): Teams;
-
 declare class Balloon {
     problem: Problem;
     team: Team;
@@ -398,6 +399,7 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    linkTeamAndOrg(): void;
     buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;

package/dist/index.mjs

@@ -1022,6 +1022,7 @@ class BattleOfGiants {
 }
 
 class ContestOptions {
+  enableOrganization;
   calculationOfPenalty;
   submissionTimestampUnit;
   submissionHasTimeField;
@@ -1035,6 +1036,7 @@ class ContestOptions {
   teamWebcamStreamUrlTemplate;
   teamScreenStreamUrlTemplate;
   constructor() {
+    this.enableOrganization = false;
     this.calculationOfPenalty = "in_minutes";
     this.submissionTimestampUnit = "second";
     this.submissionHasTimeField = false;
@@ -1047,6 +1049,7 @@ class ContestOptions {
 function createContestOptions(contestOptionsJSON = {}) {
   const j = contestOptionsJSON;
   const o = new ContestOptions();
+  o.enableOrganization = !!j.enable_organization;
   if (j.calculation_of_penalty) {
     o.calculationOfPenalty = j.calculation_of_penalty;
   }
@@ -1077,6 +1080,44 @@ class Group {
   }
 }
 
+class Organization {
+  id;
+  name;
+  logo;
+  icpcID;
+  // Teams belonging to this organization
+  teams;
+  rank;
+  constructor() {
+    this.id = "";
+    this.name = new I18nText();
+    this.teams = [];
+    this.rank = -1;
+  }
+  reset() {
+    this.rank = -1;
+  }
+  static compare(lhs, rhs) {
+    if (lhs.id < rhs.id) {
+      return -1;
+    } else if (lhs.id > rhs.id) {
+      return 1;
+    }
+    return 0;
+  }
+}
+function createOrganization(orgJSON) {
+  const org = new Organization();
+  org.id = orgJSON.id;
+  org.name = I18nText.fromIText(orgJSON.name);
+  org.logo = orgJSON.logo;
+  org.icpcID = orgJSON.icpc_id;
+  return org;
+}
+function createOrganizations(orgsJSON) {
+  return orgsJSON.map((org) => createOrganization(org));
+}
+
 class Contest {
   id = "";
   name;
@@ -1095,7 +1136,6 @@ class Contest {
   problems;
   problemsMap;
   statusTimeDisplay;
-  badge;
   organization;
   medal;
   awards;
@@ -1106,6 +1146,7 @@ class Contest {
   bannerMode;
   boardLink;
   options;
+  organizations;
   constructor() {
     this.name = new I18nText();
     this.startTime = createDayJS();
@@ -1257,7 +1298,6 @@ function createContest(contestJSON) {
       pending: Boolean(contestJSON.status_time_display.pending ?? false)
     };
   }
-  c.badge = contestJSON.badge;
   c.organization = contestJSON.organization;
   c.medal = contestJSON.medal;
   (() => {
@@ -1330,6 +1370,12 @@ function createContest(contestJSON) {
   if (contestJSON.options) {
     c.options = createContestOptions(contestJSON.options);
   }
+  if (c.organization) {
+    c.options.enableOrganization = true;
+  }
+  if (contestJSON.organizations) {
+    c.organizations = createOrganizations(contestJSON.organizations);
+  }
   return c;
 }
 
@@ -1607,9 +1653,9 @@ class GeneralExcelConverter {
     {
       const head = [];
       head.push("Rank");
-      if (rank.contest.organization) {
-        head.push(`${rank.contest.organization} Rank`);
-        head.push(rank.contest.organization);
+      if (rank.contest.options.enableOrganization) {
+        head.push("Organization Rank");
+        head.push("Organization");
       }
       head.push("Team", "Solved", "Penalty", ...rank.contest.problems.map((p) => p.label), "Dirt");
       if (enableAwards) {
@@ -1750,49 +1796,14 @@ function getImageSource(image, data_host) {
     return `${normalizePath(data_host)}${image.url}`;
   }
   if (image?.base64) {
+    if (image.mime) {
+      return `data:${image.mime};base64,${image.base64}`;
+    }
     return `data:image/${image.type ?? "png"};base64,${image.base64}`;
   }
   return "";
 }
 
-class Organization {
-  id;
-  name;
-  logo;
-  icpcID;
-  // Teams belonging to this organization
-  teams;
-  rank;
-  constructor() {
-    this.id = "";
-    this.name = new I18nText();
-    this.teams = [];
-    this.rank = -1;
-  }
-  reset() {
-    this.rank = -1;
-  }
-  static compare(lhs, rhs) {
-    if (lhs.id < rhs.id) {
-      return -1;
-    } else if (lhs.id > rhs.id) {
-      return 1;
-    }
-    return 0;
-  }
-}
-function createOrganization(orgJSON) {
-  const org = new Organization();
-  org.id = orgJSON.id;
-  org.name = I18nText.fromIText(orgJSON.name);
-  org.logo = orgJSON.logo;
-  org.icpcID = orgJSON.icpc_id;
-  return org;
-}
-function createOrganizations(orgsJSON) {
-  return orgsJSON.map((org) => createOrganization(org));
-}
-
 class RankStatistics {
   teamSolvedNum;
   teamSolvedNumIndex;
@@ -1943,8 +1954,16 @@ class Rank {
       });
     }
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.organizationsMap = this.buildOrganizationsMap();
-    this.organizations = [...this.organizationsMap.values()];
+    if (this.contest.organizations) {
+      this.organizations = this.contest.organizations;
+      this.organizationsMap = new Map(
+        this.organizations.map((org) => [org.id, org])
+      );
+      this.linkTeamAndOrg();
+    } else {
+      this.organizationsMap = this.buildOrganizationsMap();
+      this.organizations = [...this.organizationsMap.values()];
+    }
     this.organizations.sort(Organization.compare);
     this.originTeams = this.teams.map((t) => t);
     this.originTeams.sort(Team.compare);
@@ -1968,8 +1987,16 @@ class Rank {
       this.statuses = [...se].sort();
     }
   }
+  linkTeamAndOrg() {
+    this.teams.forEach((t) => {
+      if (!t.organizationId) {
+        return;
+      }
+      t.organization = this.organizationsMap.get(t.organizationId);
+    });
+  }
   buildOrganizationsMap() {
-    if (!this.contest.organization) {
+    if (!this.contest.options.enableOrganization) {
       return /* @__PURE__ */ new Map();
     }
     const res = /* @__PURE__ */ new Map();
@@ -2155,7 +2182,7 @@ class Rank {
     }
   }
   buildOrgRank() {
-    if (!this.contest.organization) {
+    if (!this.contest.options.enableOrganization) {
       return;
     }
     let rank = 1;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xcpcio/core",
   "type": "module",
-  "version": "0.78.7",
+  "version": "0.79.1",
   "description": "The core library for XCPCIO",
   "author": "Dup4 <hi@dup4.com>",
   "license": "MIT",
@@ -42,7 +42,7 @@
     "papaparse": "^5.5.3",
     "string-width": "^8.1.0",
     "xlsx-js-style": "^1.2.0",
-    "@xcpcio/types": "0.78.7"
+    "@xcpcio/types": "0.79.1"
   },
   "devDependencies": {
     "@babel/types": "^7.28.6",