@xcpcio/core 0.71.1 → 0.73.1

package/dist/index.cjs

@@ -131,6 +131,9 @@ class I18nText {
     }
     return result;
   }
+  valueOf() {
+    return this.getOrDefault();
+  }
 }
 
 function calcDirt(attemptedNum, solvedNum) {
@@ -659,14 +662,16 @@ class PlaceChartPointData {
 class Team {
   id;
   name;
+  organizationId;
+  organizationName;
   organization;
+  isFirstRankOfOrganization;
   group;
   tag;
   coaches;
   members;
   rank;
   originalRank;
-  organizationRank;
   solvedProblemNum;
   attemptedProblemNum;
   lastSolvedProblem;
@@ -686,14 +691,13 @@ class Team {
   constructor() {
     this.id = "";
     this.name = new I18nText();
-    this.organization = "";
+    this.isFirstRankOfOrganization = false;
     this.group = [];
     this.tag = [];
     this.coaches = [];
     this.members = [];
     this.rank = 0;
     this.originalRank = 0;
-    this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.lastSolvedProblem = null;
@@ -708,9 +712,9 @@ class Team {
     this.se = 0;
   }
   reset() {
+    this.isFirstRankOfOrganization = false;
     this.rank = 0;
     this.originalRank = 0;
-    this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.lastSolvedProblem = null;
@@ -834,11 +838,20 @@ function createTeam(teamJSON) {
   const t = new Team();
   t.id = teamJSON.id ?? teamJSON.team_id ?? "";
   t.name = I18nText.fromIText(teamJSON.name ?? teamJSON.team_name ?? "");
-  t.organization = teamJSON.organization ?? "";
+  if (teamJSON.organization) {
+    t.organizationId = teamJSON.organization;
+    t.organizationName = teamJSON.organization;
+  } else {
+    t.organizationId = teamJSON.organization_id;
+  }
   t.group = ___default.cloneDeep(teamJSON.group ?? []);
   t.tag = ___default.cloneDeep(teamJSON.tag ?? []);
-  t.coaches = createPersons(teamJSON.coach);
   t.members = createPersons(teamJSON.members);
+  if (teamJSON.coach) {
+    t.coaches = createPersons(teamJSON.coach);
+  } else {
+    t.coaches = createPersons(teamJSON.coaches);
+  }
   if (Boolean(teamJSON.official) === true) {
     t.group.push("official");
   }
@@ -1416,7 +1429,7 @@ class CodeforcesGymGhostDATConverter {
     rank.teams.forEach((team) => {
       let name = team.name.getOrDefault();
       if (team.organization) {
-        name = `${team.organization} - ${name}`;
+        name = `${team.organization.name.getOrDefault()} - ${name}`;
       }
       if (team.members) {
         name = `${name} - ${team.membersToString()}`;
@@ -1617,12 +1630,12 @@ class GeneralExcelConverter {
       const arr = [];
       arr.push(team.rank.toString());
       if (team.organization) {
-        if (team.organizationRank !== -1) {
-          arr.push(team.organizationRank.toString());
+        if (team.isFirstRankOfOrganization) {
+          arr.push(team.organization.rank.toString());
         } else {
           arr.push("");
         }
-        arr.push(team.organization);
+        arr.push(team.organization.name.getOrDefault());
       }
       arr.push(team.name.getOrDefault(), team.solvedProblemNum.toString(), team.penaltyToMinute.toString());
       for (const p of team.problemStatistics) {
@@ -1693,7 +1706,7 @@ class ICPCStandingsCsvConverter {
         siteCitation: rank.contest.name.getOrDefault(),
         citation: ordinal__default(team.rank),
         teamName: team.name.getOrDefault(),
-        institution: team.organization
+        institution: team.organization?.name.getOrDefault() ?? ""
       };
       resList.push(res);
     }
@@ -1740,6 +1753,42 @@ function getImageSource(image, asset_host) {
   return "";
 }
 
+class Organization {
+  id;
+  name;
+  logo;
+  // 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;
+  return org;
+}
+function createOrganizations(orgsJSON) {
+  return orgsJSON.map((org) => createOrganization(org));
+}
+
 class RankStatistics {
   teamSolvedNum;
   teamSolvedNumIndex;
@@ -1864,6 +1913,7 @@ class Rank {
   submissions;
   submissionsMap;
   organizations;
+  organizationsMap;
   originTeams;
   rankStatistics;
   options;
@@ -1889,7 +1939,9 @@ class Rank {
       });
     }
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.organizations = this.buildOrganizations();
+    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);
     this.rankStatistics = new RankStatistics();
@@ -1912,6 +1964,31 @@ class Rank {
       this.statuses = [...se].sort();
     }
   }
+  buildOrganizationsMap() {
+    if (!this.contest.organization) {
+      return /* @__PURE__ */ new Map();
+    }
+    const res = /* @__PURE__ */ new Map();
+    this.teams.forEach((t) => {
+      if (!t.organizationId) {
+        return;
+      }
+      if (res.has(t.organizationId)) {
+        const org2 = res.get(t.organizationId);
+        org2?.teams.push(t);
+        t.organization = org2;
+        return;
+      }
+      const org = new Organization();
+      org.id = t.organizationId;
+      org.name = new I18nText();
+      org.name.fallback = t.organizationName;
+      org.teams.push(t);
+      t.organization = org;
+      res.set(org.id, org);
+    });
+    return res;
+  }
   cleanRank() {
     (() => {
       this.teams = [];
@@ -1922,6 +1999,9 @@ class Rank {
         this.teams.push(v);
       }
     })();
+    for (const o of this.organizations) {
+      o.reset();
+    }
     for (const t of this.teams) {
       t.reset();
       t.problemStatistics = this.contest.problems.map((p) => {
@@ -2076,39 +2156,21 @@ class Rank {
     }
     let rank = 1;
     let preTeam = null;
-    const se = /* @__PURE__ */ new Set();
     for (const t of this.teams) {
       const org = t.organization;
-      if (se.has(org)) {
+      if (!org || org.rank > -1) {
         continue;
       }
-      se.add(org);
-      t.organizationRank = rank++;
-      if (preTeam !== null) {
+      org.rank = rank++;
+      t.isFirstRankOfOrganization = true;
+      if (preTeam) {
         if (t.isEqualRank(preTeam)) {
-          t.organizationRank = preTeam.organizationRank;
+          org.rank = preTeam.organization.rank;
         }
       }
       preTeam = t;
     }
   }
-  buildOrganizations() {
-    if (!this.contest.organization) {
-      return [];
-    }
-    const res = new Array();
-    const se = /* @__PURE__ */ new Set();
-    this.teams.forEach((t) => {
-      const org = t.organization;
-      if (se.has(org)) {
-        return;
-      }
-      res.push(org);
-      se.add(org);
-    });
-    res.sort();
-    return res;
-  }
   buildAwards() {
     if (this.contest.medal === "ccpc") {
       this.contest.awards = /* @__PURE__ */ new Map();
@@ -2444,7 +2506,7 @@ class Rating {
           u = new RatingUser();
           u.id = id;
           u.name = t.name;
-          u.organization = t.organization;
+          u.organization = t.organizationName ?? "";
           u.members = t.members;
           u.coaches = t.coaches;
           u.rank = t.rank;
@@ -2464,7 +2526,7 @@ class Rating {
           h.rank = t.rank;
           h.rating = u.rating;
           h.teamName = t.name;
-          h.organization = t.organization;
+          h.organization = t.organizationName ?? "";
           h.members = t.members;
           h.coaches = t.coaches;
           h.contestID = rank.contest.id;
@@ -2485,7 +2547,7 @@ class Rating {
     if (persons.length > 0) {
       return persons.map((person) => person.name.getOrDefault().trim()).sort().join("|");
     }
-    return `${t.organization}-${t.name}`;
+    return `${t.organizationName ?? ""}-${t.name}`;
   }
   toJSON() {
     return {
@@ -2848,6 +2910,7 @@ exports.GiantsType = GiantsType;
 exports.I18nText = I18nText;
 exports.ICPCStandingsCsvConverter = ICPCStandingsCsvConverter;
 exports.MedalType = MedalType;
+exports.Organization = Organization;
 exports.Person = Person;
 exports.PlaceChartPointData = PlaceChartPointData;
 exports.Problem = Problem;
@@ -2872,6 +2935,8 @@ exports.createContest = createContest;
 exports.createContestIndex = createContestIndex;
 exports.createContestIndexList = createContestIndexList;
 exports.createDayJS = createDayJS;
+exports.createOrganization = createOrganization;
+exports.createOrganizations = createOrganizations;
 exports.createPersons = createPersons;
 exports.createProblem = createProblem;
 exports.createProblems = createProblems;

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, 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 { 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 dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -35,6 +35,7 @@ declare class I18nText {
     static fromI18NStringSet(stringSet: I18NStringSet): I18nText;
     static fromIText(text: Text): I18nText;
     toI18NStringSet(): I18NStringSet;
+    valueOf(): string;
 }
 
 declare class ContestOptions {
@@ -192,6 +193,20 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    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;
@@ -212,14 +227,16 @@ declare class PlaceChartPointData {
 declare class Team {
     id: string;
     name: I18nText;
-    organization: string;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
     group: Array<string>;
     tag: Array<string>;
     coaches: Persons;
     members: Persons;
     rank: number;
     originalRank: number;
-    organizationRank: number;
     solvedProblemNum: number;
     attemptedProblemNum: number;
     lastSolvedProblem: Problem | null;
@@ -363,7 +380,8 @@ declare class Rank {
     teamsMap: Map<string, Team>;
     submissions: Submissions;
     submissionsMap: Map<string, Submission>;
-    organizations: Array<string>;
+    organizations: Organizations;
+    organizationsMap: Map<string, Organization>;
     originTeams: Teams;
     rankStatistics: RankStatistics;
     options: RankOptions;
@@ -371,11 +389,11 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;
     buildTeamRank(): void;
     buildOrgRank(): void;
-    buildOrganizations(): string[];
     buildAwards(): void;
     filterTeamByOrg(team: Team): boolean;
     getSubmissions(): Submissions;
@@ -535,5 +553,5 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
-export type { Awards, Balloons, ContestIndexList, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };
+export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Organization, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createOrganization, createOrganizations, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export type { Awards, Balloons, ContestIndexList, Organizations, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };

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, 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 { 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 dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -35,6 +35,7 @@ declare class I18nText {
     static fromI18NStringSet(stringSet: I18NStringSet): I18nText;
     static fromIText(text: Text): I18nText;
     toI18NStringSet(): I18NStringSet;
+    valueOf(): string;
 }
 
 declare class ContestOptions {
@@ -192,6 +193,20 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    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;
@@ -212,14 +227,16 @@ declare class PlaceChartPointData {
 declare class Team {
     id: string;
     name: I18nText;
-    organization: string;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
     group: Array<string>;
     tag: Array<string>;
     coaches: Persons;
     members: Persons;
     rank: number;
     originalRank: number;
-    organizationRank: number;
     solvedProblemNum: number;
     attemptedProblemNum: number;
     lastSolvedProblem: Problem | null;
@@ -363,7 +380,8 @@ declare class Rank {
     teamsMap: Map<string, Team>;
     submissions: Submissions;
     submissionsMap: Map<string, Submission>;
-    organizations: Array<string>;
+    organizations: Organizations;
+    organizationsMap: Map<string, Organization>;
     originTeams: Teams;
     rankStatistics: RankStatistics;
     options: RankOptions;
@@ -371,11 +389,11 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;
     buildTeamRank(): void;
     buildOrgRank(): void;
-    buildOrganizations(): string[];
     buildAwards(): void;
     filterTeamByOrg(team: Team): boolean;
     getSubmissions(): Submissions;
@@ -535,5 +553,5 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
-export type { Awards, Balloons, ContestIndexList, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };
+export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Organization, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createOrganization, createOrganizations, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export type { Awards, Balloons, ContestIndexList, Organizations, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };

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, 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 { 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 dayjs from 'dayjs';
 export { default as dayjs } from 'dayjs';
 import * as XLSX from 'xlsx-js-style';
@@ -35,6 +35,7 @@ declare class I18nText {
     static fromI18NStringSet(stringSet: I18NStringSet): I18nText;
     static fromIText(text: Text): I18nText;
     toI18NStringSet(): I18NStringSet;
+    valueOf(): string;
 }
 
 declare class ContestOptions {
@@ -192,6 +193,20 @@ declare class TeamProblemStatistics {
     get penaltyInSecond(): number;
 }
 
+declare class Organization {
+    id: string;
+    name: I18nText;
+    logo?: Image;
+    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;
@@ -212,14 +227,16 @@ declare class PlaceChartPointData {
 declare class Team {
     id: string;
     name: I18nText;
-    organization: string;
+    organizationId?: string;
+    organizationName?: string;
+    organization?: Organization;
+    isFirstRankOfOrganization: boolean;
     group: Array<string>;
     tag: Array<string>;
     coaches: Persons;
     members: Persons;
     rank: number;
     originalRank: number;
-    organizationRank: number;
     solvedProblemNum: number;
     attemptedProblemNum: number;
     lastSolvedProblem: Problem | null;
@@ -363,7 +380,8 @@ declare class Rank {
     teamsMap: Map<string, Team>;
     submissions: Submissions;
     submissionsMap: Map<string, Submission>;
-    organizations: Array<string>;
+    organizations: Organizations;
+    organizationsMap: Map<string, Organization>;
     originTeams: Teams;
     rankStatistics: RankStatistics;
     options: RankOptions;
@@ -371,11 +389,11 @@ declare class Rank {
     languages: Array<string>;
     statuses: Array<SubmissionStatus>;
     constructor(contest: Contest, teams: Teams, submissions: Submissions);
+    buildOrganizationsMap(): Map<string, Organization>;
     cleanRank(): void;
     buildRank(): this;
     buildTeamRank(): void;
     buildOrgRank(): void;
-    buildOrganizations(): string[];
     buildAwards(): void;
     filterTeamByOrg(team: Team): boolean;
     getSubmissions(): Submissions;
@@ -535,5 +553,5 @@ declare function isRejected(status: SubmissionStatus): boolean;
 declare function isPending(status: SubmissionStatus): boolean;
 declare function isNotCalculatedPenaltyStatus(status: SubmissionStatus): boolean;
 
-export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
-export type { Awards, Balloons, ContestIndexList, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };
+export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Organization, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createOrganization, createOrganizations, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export type { Awards, Balloons, ContestIndexList, Organizations, Persons, Problems, Ranks, RatingHistories, RatingUserMap, RatingUsers, SelectOptionItem, Submissions, Teams };

package/dist/index.mjs

@@ -100,6 +100,9 @@ class I18nText {
     }
     return result;
   }
+  valueOf() {
+    return this.getOrDefault();
+  }
 }
 
 function calcDirt(attemptedNum, solvedNum) {
@@ -628,14 +631,16 @@ class PlaceChartPointData {
 class Team {
   id;
   name;
+  organizationId;
+  organizationName;
   organization;
+  isFirstRankOfOrganization;
   group;
   tag;
   coaches;
   members;
   rank;
   originalRank;
-  organizationRank;
   solvedProblemNum;
   attemptedProblemNum;
   lastSolvedProblem;
@@ -655,14 +660,13 @@ class Team {
   constructor() {
     this.id = "";
     this.name = new I18nText();
-    this.organization = "";
+    this.isFirstRankOfOrganization = false;
     this.group = [];
     this.tag = [];
     this.coaches = [];
     this.members = [];
     this.rank = 0;
     this.originalRank = 0;
-    this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.lastSolvedProblem = null;
@@ -677,9 +681,9 @@ class Team {
     this.se = 0;
   }
   reset() {
+    this.isFirstRankOfOrganization = false;
     this.rank = 0;
     this.originalRank = 0;
-    this.organizationRank = -1;
     this.solvedProblemNum = 0;
     this.attemptedProblemNum = 0;
     this.lastSolvedProblem = null;
@@ -803,11 +807,20 @@ function createTeam(teamJSON) {
   const t = new Team();
   t.id = teamJSON.id ?? teamJSON.team_id ?? "";
   t.name = I18nText.fromIText(teamJSON.name ?? teamJSON.team_name ?? "");
-  t.organization = teamJSON.organization ?? "";
+  if (teamJSON.organization) {
+    t.organizationId = teamJSON.organization;
+    t.organizationName = teamJSON.organization;
+  } else {
+    t.organizationId = teamJSON.organization_id;
+  }
   t.group = _.cloneDeep(teamJSON.group ?? []);
   t.tag = _.cloneDeep(teamJSON.tag ?? []);
-  t.coaches = createPersons(teamJSON.coach);
   t.members = createPersons(teamJSON.members);
+  if (teamJSON.coach) {
+    t.coaches = createPersons(teamJSON.coach);
+  } else {
+    t.coaches = createPersons(teamJSON.coaches);
+  }
   if (Boolean(teamJSON.official) === true) {
     t.group.push("official");
   }
@@ -1385,7 +1398,7 @@ class CodeforcesGymGhostDATConverter {
     rank.teams.forEach((team) => {
       let name = team.name.getOrDefault();
       if (team.organization) {
-        name = `${team.organization} - ${name}`;
+        name = `${team.organization.name.getOrDefault()} - ${name}`;
       }
       if (team.members) {
         name = `${name} - ${team.membersToString()}`;
@@ -1586,12 +1599,12 @@ class GeneralExcelConverter {
       const arr = [];
       arr.push(team.rank.toString());
       if (team.organization) {
-        if (team.organizationRank !== -1) {
-          arr.push(team.organizationRank.toString());
+        if (team.isFirstRankOfOrganization) {
+          arr.push(team.organization.rank.toString());
         } else {
           arr.push("");
         }
-        arr.push(team.organization);
+        arr.push(team.organization.name.getOrDefault());
       }
       arr.push(team.name.getOrDefault(), team.solvedProblemNum.toString(), team.penaltyToMinute.toString());
       for (const p of team.problemStatistics) {
@@ -1662,7 +1675,7 @@ class ICPCStandingsCsvConverter {
         siteCitation: rank.contest.name.getOrDefault(),
         citation: ordinal(team.rank),
         teamName: team.name.getOrDefault(),
-        institution: team.organization
+        institution: team.organization?.name.getOrDefault() ?? ""
       };
       resList.push(res);
     }
@@ -1709,6 +1722,42 @@ function getImageSource(image, asset_host) {
   return "";
 }
 
+class Organization {
+  id;
+  name;
+  logo;
+  // 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;
+  return org;
+}
+function createOrganizations(orgsJSON) {
+  return orgsJSON.map((org) => createOrganization(org));
+}
+
 class RankStatistics {
   teamSolvedNum;
   teamSolvedNumIndex;
@@ -1833,6 +1882,7 @@ class Rank {
   submissions;
   submissionsMap;
   organizations;
+  organizationsMap;
   originTeams;
   rankStatistics;
   options;
@@ -1858,7 +1908,9 @@ class Rank {
       });
     }
     this.submissionsMap = new Map(this.submissions.map((s) => [s.id, s]));
-    this.organizations = this.buildOrganizations();
+    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);
     this.rankStatistics = new RankStatistics();
@@ -1881,6 +1933,31 @@ class Rank {
       this.statuses = [...se].sort();
     }
   }
+  buildOrganizationsMap() {
+    if (!this.contest.organization) {
+      return /* @__PURE__ */ new Map();
+    }
+    const res = /* @__PURE__ */ new Map();
+    this.teams.forEach((t) => {
+      if (!t.organizationId) {
+        return;
+      }
+      if (res.has(t.organizationId)) {
+        const org2 = res.get(t.organizationId);
+        org2?.teams.push(t);
+        t.organization = org2;
+        return;
+      }
+      const org = new Organization();
+      org.id = t.organizationId;
+      org.name = new I18nText();
+      org.name.fallback = t.organizationName;
+      org.teams.push(t);
+      t.organization = org;
+      res.set(org.id, org);
+    });
+    return res;
+  }
   cleanRank() {
     (() => {
       this.teams = [];
@@ -1891,6 +1968,9 @@ class Rank {
         this.teams.push(v);
       }
     })();
+    for (const o of this.organizations) {
+      o.reset();
+    }
     for (const t of this.teams) {
       t.reset();
       t.problemStatistics = this.contest.problems.map((p) => {
@@ -2045,39 +2125,21 @@ class Rank {
     }
     let rank = 1;
     let preTeam = null;
-    const se = /* @__PURE__ */ new Set();
     for (const t of this.teams) {
       const org = t.organization;
-      if (se.has(org)) {
+      if (!org || org.rank > -1) {
         continue;
       }
-      se.add(org);
-      t.organizationRank = rank++;
-      if (preTeam !== null) {
+      org.rank = rank++;
+      t.isFirstRankOfOrganization = true;
+      if (preTeam) {
         if (t.isEqualRank(preTeam)) {
-          t.organizationRank = preTeam.organizationRank;
+          org.rank = preTeam.organization.rank;
         }
       }
       preTeam = t;
     }
   }
-  buildOrganizations() {
-    if (!this.contest.organization) {
-      return [];
-    }
-    const res = new Array();
-    const se = /* @__PURE__ */ new Set();
-    this.teams.forEach((t) => {
-      const org = t.organization;
-      if (se.has(org)) {
-        return;
-      }
-      res.push(org);
-      se.add(org);
-    });
-    res.sort();
-    return res;
-  }
   buildAwards() {
     if (this.contest.medal === "ccpc") {
       this.contest.awards = /* @__PURE__ */ new Map();
@@ -2413,7 +2475,7 @@ class Rating {
           u = new RatingUser();
           u.id = id;
           u.name = t.name;
-          u.organization = t.organization;
+          u.organization = t.organizationName ?? "";
           u.members = t.members;
           u.coaches = t.coaches;
           u.rank = t.rank;
@@ -2433,7 +2495,7 @@ class Rating {
           h.rank = t.rank;
           h.rating = u.rating;
           h.teamName = t.name;
-          h.organization = t.organization;
+          h.organization = t.organizationName ?? "";
           h.members = t.members;
           h.coaches = t.coaches;
           h.contestID = rank.contest.id;
@@ -2454,7 +2516,7 @@ class Rating {
     if (persons.length > 0) {
       return persons.map((person) => person.name.getOrDefault().trim()).sort().join("|");
     }
-    return `${t.organization}-${t.name}`;
+    return `${t.organizationName ?? ""}-${t.name}`;
   }
   toJSON() {
     return {
@@ -2802,4 +2864,4 @@ class ResolverVue extends Resolver {
   }
 }
 
-export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };
+export { Award, Balloon, BattleOfGiants, CodeforcesGymGhostDATConverter, Contest, ContestIndex, ContestIndexConfig, ContestOptions, GeneralExcelConverter, Giants, GiantsType, I18nText, ICPCStandingsCsvConverter, MedalType, Organization, Person, PlaceChartPointData, Problem, ProblemStatistics, Rank, RankOptions, RankStatistics, Rating, RatingCalculator, RatingHistory, RatingLevel, RatingLevelToString, RatingUser, RatingUtility, Resolver, ResolverVue, Submission, Team, TeamProblemStatistics, calcDirt, createContest, createContestIndex, createContestIndexList, createDayJS, createOrganization, createOrganizations, createPersons, createProblem, createProblems, createProblemsByProblemIds, createSubmission, createSubmissions, createTeam, createTeams, getImageSource, getTimeDiff, getTimestamp, getWhiteOrBlackColor, getWhiteOrBlackColorV1, isAccepted, isNotCalculatedPenaltyStatus, isPending, isRejected, isValidMedalType, stringToSubmissionStatus };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@xcpcio/core",
   "type": "module",
-  "version": "0.71.1",
+  "version": "0.73.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.71.1"
+    "@xcpcio/types": "0.73.1"
   },
   "devDependencies": {
     "@babel/types": "^7.28.5",