@algoux/standard-ranklist-utils 0.2.1 → 0.2.3

package/dist/index.cjs

@@ -269,6 +269,21 @@ function sortRows(rows) {
   });
   return rows;
 }
+function cloneDeep(obj) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map((item) => cloneDeep(item));
+  }
+  const clonedObj = {};
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      clonedObj[key] = cloneDeep(obj[key]);
+    }
+  }
+  return clonedObj;
+}
 function regenerateRanklistBySolutions(originalRanklist, solutions) {
   var _a;
   if (!canRegenerateRanklist(originalRanklist)) {
@@ -278,15 +293,18 @@ function regenerateRanklistBySolutions(originalRanklist, solutions) {
     penalty: [20, "min"],
     noPenaltyResults: ["FB", "AC", "?", "CE", "UKE", null],
     timeRounding: "floor",
-    ...JSON.parse(JSON.stringify(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {}))
-  };
-  const ranklist = {
-    ...originalRanklist,
-    rows: []
+    ...cloneDeep(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {})
   };
+  const ranklist = {};
+  for (const key in originalRanklist) {
+    if (key !== "rows" && originalRanklist.hasOwnProperty(key)) {
+      ranklist[key] = cloneDeep(originalRanklist[key]);
+    }
+  }
+  ranklist.rows = [];
   const rows = [];
   const userRowMap = /* @__PURE__ */ new Map();
-  const problemCount = originalRanklist.problems.length;
+  const problemCount = ranklist.problems.length;
   originalRanklist.rows.forEach((row) => {
     const userId = row.user.id && `${row.user.id}` || `${typeof row.user.name === "string" ? row.user.name : JSON.stringify(row.user.name)}`;
     userRowMap.set(userId, {
@@ -382,7 +400,7 @@ function regenerateRowsByIncrementalSolutions(originalRanklist, solutions) {
     penalty: [20, "min"],
     noPenaltyResults: ["FB", "AC", "?", "CE", "UKE", null],
     timeRounding: "floor",
-    ...JSON.parse(JSON.stringify(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {}))
+    ...cloneDeep(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {})
   };
   const userRowIndexMap = /* @__PURE__ */ new Map();
   const rows = [...originalRanklist.rows];
@@ -608,13 +626,15 @@ function genSeriesCalcFns(series, rows, ranks, officialRanks) {
   });
   return fns;
 }
-function genRowRanks(rows) {
+function genRowRanks(rows, options = {}) {
   const compareScoreEqual = (a, b) => {
     if (a.value !== b.value) {
       return false;
     }
-    const da = a.time ? formatTimeDuration(a.time) : 0;
-    const db = b.time ? formatTimeDuration(b.time) : 0;
+    const rankingTimePrecision = options.rankingTimePrecision || "ms";
+    const rankingTimeRoundingFn = options.rankingTimeRounding === "ceil" ? Math.ceil : options.rankingTimeRounding === "round" ? Math.round : Math.floor;
+    const da = a.time ? formatTimeDuration(a.time, rankingTimePrecision, rankingTimeRoundingFn) : 0;
+    const db = b.time ? formatTimeDuration(b.time, rankingTimePrecision, rankingTimeRoundingFn) : 0;
     return da === db;
   };
   const genRanks = (rows2) => {
@@ -651,11 +671,15 @@ function genRowRanks(rows) {
   };
 }
 function convertToStaticRanklist(ranklist) {
+  var _a, _b, _c, _d;
   if (!ranklist) {
     return ranklist;
   }
   const { series, rows } = ranklist;
-  const rowRanks = genRowRanks(rows);
+  const rowRanks = genRowRanks(rows, {
+    rankingTimePrecision: (_b = (_a = ranklist.sorter) == null ? void 0 : _a.config) == null ? void 0 : _b.rankingTimePrecision,
+    rankingTimeRounding: (_d = (_c = ranklist.sorter) == null ? void 0 : _c.config) == null ? void 0 : _d.rankingTimeRounding
+  });
   const seriesCalcFns = genSeriesCalcFns(series, rows, rowRanks.ranks, rowRanks.officialRanks);
   return {
     ...ranklist,

package/dist/index.mjs

@@ -267,6 +267,21 @@ function sortRows(rows) {
   });
   return rows;
 }
+function cloneDeep(obj) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map((item) => cloneDeep(item));
+  }
+  const clonedObj = {};
+  for (const key in obj) {
+    if (obj.hasOwnProperty(key)) {
+      clonedObj[key] = cloneDeep(obj[key]);
+    }
+  }
+  return clonedObj;
+}
 function regenerateRanklistBySolutions(originalRanklist, solutions) {
   var _a;
   if (!canRegenerateRanklist(originalRanklist)) {
@@ -276,15 +291,18 @@ function regenerateRanklistBySolutions(originalRanklist, solutions) {
     penalty: [20, "min"],
     noPenaltyResults: ["FB", "AC", "?", "CE", "UKE", null],
     timeRounding: "floor",
-    ...JSON.parse(JSON.stringify(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {}))
-  };
-  const ranklist = {
-    ...originalRanklist,
-    rows: []
+    ...cloneDeep(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {})
   };
+  const ranklist = {};
+  for (const key in originalRanklist) {
+    if (key !== "rows" && originalRanklist.hasOwnProperty(key)) {
+      ranklist[key] = cloneDeep(originalRanklist[key]);
+    }
+  }
+  ranklist.rows = [];
   const rows = [];
   const userRowMap = /* @__PURE__ */ new Map();
-  const problemCount = originalRanklist.problems.length;
+  const problemCount = ranklist.problems.length;
   originalRanklist.rows.forEach((row) => {
     const userId = row.user.id && `${row.user.id}` || `${typeof row.user.name === "string" ? row.user.name : JSON.stringify(row.user.name)}`;
     userRowMap.set(userId, {
@@ -380,7 +398,7 @@ function regenerateRowsByIncrementalSolutions(originalRanklist, solutions) {
     penalty: [20, "min"],
     noPenaltyResults: ["FB", "AC", "?", "CE", "UKE", null],
     timeRounding: "floor",
-    ...JSON.parse(JSON.stringify(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {}))
+    ...cloneDeep(((_a = originalRanklist.sorter) == null ? void 0 : _a.config) || {})
   };
   const userRowIndexMap = /* @__PURE__ */ new Map();
   const rows = [...originalRanklist.rows];
@@ -606,13 +624,15 @@ function genSeriesCalcFns(series, rows, ranks, officialRanks) {
   });
   return fns;
 }
-function genRowRanks(rows) {
+function genRowRanks(rows, options = {}) {
   const compareScoreEqual = (a, b) => {
     if (a.value !== b.value) {
       return false;
     }
-    const da = a.time ? formatTimeDuration(a.time) : 0;
-    const db = b.time ? formatTimeDuration(b.time) : 0;
+    const rankingTimePrecision = options.rankingTimePrecision || "ms";
+    const rankingTimeRoundingFn = options.rankingTimeRounding === "ceil" ? Math.ceil : options.rankingTimeRounding === "round" ? Math.round : Math.floor;
+    const da = a.time ? formatTimeDuration(a.time, rankingTimePrecision, rankingTimeRoundingFn) : 0;
+    const db = b.time ? formatTimeDuration(b.time, rankingTimePrecision, rankingTimeRoundingFn) : 0;
     return da === db;
   };
   const genRanks = (rows2) => {
@@ -649,11 +669,15 @@ function genRowRanks(rows) {
   };
 }
 function convertToStaticRanklist(ranklist) {
+  var _a, _b, _c, _d;
   if (!ranklist) {
     return ranklist;
   }
   const { series, rows } = ranklist;
-  const rowRanks = genRowRanks(rows);
+  const rowRanks = genRowRanks(rows, {
+    rankingTimePrecision: (_b = (_a = ranklist.sorter) == null ? void 0 : _a.config) == null ? void 0 : _b.rankingTimePrecision,
+    rankingTimeRounding: (_d = (_c = ranklist.sorter) == null ? void 0 : _c.config) == null ? void 0 : _d.rankingTimeRounding
+  });
   const seriesCalcFns = genSeriesCalcFns(series, rows, rowRanks.ranks, rowRanks.officialRanks);
   return {
     ...ranklist,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algoux/standard-ranklist-utils",
-  "version": "0.2.1",
+  "version": "0.2.3",
   "author": "bLue",
   "keywords": [
     "standard ranklist",
@@ -35,7 +35,7 @@
     "textcolor": "^1.0.2"
   },
   "devDependencies": {
-    "@algoux/standard-ranklist": "^0.3.4",
+    "@algoux/standard-ranklist": "^0.3.7",
     "@types/node": "^16.18.38",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
     "@typescript-eslint/parser": "^5.61.0",