@algoux/standard-ranklist-utils 0.2.2 → 0.2.4

package/README.md

@@ -27,6 +27,7 @@ npm i -S @algoux/standard-ranklist-utils
 - `resolveColor`
 - `resolveThemeColor`
 - `resolveStyle`
+- `resolveUserMarkers`
 
 ### ranklist
 

package/dist/index.cjs

@@ -188,6 +188,13 @@ function resolveStyle(style) {
     backgroundColor: backgroundThemeColor
   };
 }
+function resolveUserMarkers(user, markersConfig) {
+  if (!user) {
+    return [];
+  }
+  const userMarkers = (Array.isArray(user.markers) ? user.markers : [user.marker]).filter(Boolean).map((marker) => (markersConfig || []).find((m) => m.id === marker)).filter(Boolean);
+  return userMarkers;
+}
 
 function canRegenerateRanklist(ranklist) {
   var _a;
@@ -626,13 +633,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) => {
@@ -669,11 +678,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,
@@ -703,5 +716,6 @@ exports.resolveContributor = resolveContributor;
 exports.resolveStyle = resolveStyle;
 exports.resolveText = resolveText;
 exports.resolveThemeColor = resolveThemeColor;
+exports.resolveUserMarkers = resolveUserMarkers;
 exports.secToTimeStr = secToTimeStr;
 exports.sortRows = sortRows;

package/dist/index.d.cts

@@ -90,6 +90,7 @@ declare function resolveStyle(style: srk.Style): {
     textColor: ThemeColor;
     backgroundColor: ThemeColor;
 };
+declare function resolveUserMarkers(user: srk.User, markersConfig: srk.Marker[] | undefined): srk.Marker[];
 
 declare function canRegenerateRanklist(ranklist: srk.Ranklist): boolean;
 declare function getSortedCalculatedRawSolutions(rows: srk.RanklistRow[]): CalculatedSolutionTetrad[];
@@ -99,4 +100,4 @@ declare function regenerateRanklistBySolutions(originalRanklist: srk.Ranklist, s
 declare function regenerateRowsByIncrementalSolutions(originalRanklist: srk.Ranklist, solutions: CalculatedSolutionTetrad[]): srk.RanklistRow[];
 declare function convertToStaticRanklist(ranklist: srk.Ranklist): StaticRanklist;
 
-export { type CalculatedSolutionTetrad, EnumTheme, MIN_REGEN_SUPPORTED_VERSION, type RankValue, type StaticRanklist, type ThemeColor, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, secToTimeStr, sortRows };
+export { type CalculatedSolutionTetrad, EnumTheme, MIN_REGEN_SUPPORTED_VERSION, type RankValue, type StaticRanklist, type ThemeColor, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, resolveUserMarkers, secToTimeStr, sortRows };

package/dist/index.d.mts

@@ -90,6 +90,7 @@ declare function resolveStyle(style: srk.Style): {
     textColor: ThemeColor;
     backgroundColor: ThemeColor;
 };
+declare function resolveUserMarkers(user: srk.User, markersConfig: srk.Marker[] | undefined): srk.Marker[];
 
 declare function canRegenerateRanklist(ranklist: srk.Ranklist): boolean;
 declare function getSortedCalculatedRawSolutions(rows: srk.RanklistRow[]): CalculatedSolutionTetrad[];
@@ -99,4 +100,4 @@ declare function regenerateRanklistBySolutions(originalRanklist: srk.Ranklist, s
 declare function regenerateRowsByIncrementalSolutions(originalRanklist: srk.Ranklist, solutions: CalculatedSolutionTetrad[]): srk.RanklistRow[];
 declare function convertToStaticRanklist(ranklist: srk.Ranklist): StaticRanklist;
 
-export { type CalculatedSolutionTetrad, EnumTheme, MIN_REGEN_SUPPORTED_VERSION, type RankValue, type StaticRanklist, type ThemeColor, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, secToTimeStr, sortRows };
+export { type CalculatedSolutionTetrad, EnumTheme, MIN_REGEN_SUPPORTED_VERSION, type RankValue, type StaticRanklist, type ThemeColor, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, resolveUserMarkers, secToTimeStr, sortRows };

package/dist/index.mjs

@@ -186,6 +186,13 @@ function resolveStyle(style) {
     backgroundColor: backgroundThemeColor
   };
 }
+function resolveUserMarkers(user, markersConfig) {
+  if (!user) {
+    return [];
+  }
+  const userMarkers = (Array.isArray(user.markers) ? user.markers : [user.marker]).filter(Boolean).map((marker) => (markersConfig || []).find((m) => m.id === marker)).filter(Boolean);
+  return userMarkers;
+}
 
 function canRegenerateRanklist(ranklist) {
   var _a;
@@ -624,13 +631,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) => {
@@ -667,11 +676,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,
@@ -684,4 +697,4 @@ function convertToStaticRanklist(ranklist) {
   };
 }
 
-export { EnumTheme, MIN_REGEN_SUPPORTED_VERSION, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, secToTimeStr, sortRows };
+export { EnumTheme, MIN_REGEN_SUPPORTED_VERSION, alphabetToNumber, canRegenerateRanklist, convertToStaticRanklist, filterSolutionsUntil, formatTimeDuration, getSortedCalculatedRawSolutions, numberToAlphabet, preZeroFill, regenerateRanklistBySolutions, regenerateRowsByIncrementalSolutions, resolveColor, resolveContributor, resolveStyle, resolveText, resolveThemeColor, resolveUserMarkers, secToTimeStr, sortRows };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algoux/standard-ranklist-utils",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "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",