@algoux/standard-ranklist-utils 0.1.0 → 0.1.1

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2023 algoUX
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -1 +1,31 @@
-# srk-convert-to
+# standard-ranklist-utils
+
+Utilities for standard ranklist.
+
+## Utilities
+
+### formatters
+
+- `formatTimeDuration`
+- `preZeroFill`
+- `secToTimeStr`
+- `numberToAlphabet`
+- `alphabetToNumber`
+
+### resolvers
+
+- `resolveText`
+- `resolveContributor`
+- `resolveColor`
+- `resolveThemeColor`
+- `resolveStyle`
+
+### ranklist
+
+- `canRegenerateRanklist`
+- `getSortedCalculatedRawSolutions`
+- `filterSolutionsUntil`
+- `sortRows`
+- `regenerateRanklistBySolutions`
+- `regenerateRowsByIncrementalSolutions`
+- `convertToStaticRanklist`

package/dist/ranklist.js

@@ -329,11 +329,46 @@ function genSeriesCalcFns(series, rows, ranks, officialRanks) {
             }
             case 'ICPC': {
                 const options = rule.options;
+                let filteredRows = rows.filter((row) => row.user.official === undefined || row.user.official === true);
+                let filteredOfficialRanks = [...officialRanks];
+                if (options.filter) {
+                    if (Array.isArray(options.filter.byUserFields) && options.filter.byUserFields.length) {
+                        const currentFilteredRows = [];
+                        filteredOfficialRanks = filteredOfficialRanks.map(() => null);
+                        let currentOfficialRank = 0;
+                        let currentOfficialRankOld = 0;
+                        rows.forEach((row, index) => {
+                            const shouldInclude = options.filter.byUserFields.every((filter) => {
+                                const { field, rule } = filter;
+                                const value = row.user[field];
+                                if (value === undefined) {
+                                    return false;
+                                }
+                                return new RegExp(rule).test(`${value}`);
+                            });
+                            if (shouldInclude) {
+                                currentFilteredRows.push(row);
+                                const oldRank = officialRanks[index];
+                                if (oldRank !== null) {
+                                    if (currentOfficialRankOld !== oldRank) {
+                                        currentOfficialRank++;
+                                        currentOfficialRankOld = oldRank;
+                                    }
+                                    filteredOfficialRanks[index] = currentOfficialRank;
+                                }
+                                else {
+                                    filteredOfficialRanks[index] = null;
+                                }
+                            }
+                        });
+                        filteredRows = currentFilteredRows;
+                    }
+                }
                 const usingEndpointRules = [];
                 let noTied = false;
                 if (options.ratio) {
                     const { value, rounding = 'ceil', denominator = 'all' } = options.ratio;
-                    const officialRows = rows.filter((row) => row.user.official === undefined || row.user.official === true);
+                    const officialRows = filteredRows;
                     let total = denominator === 'submitted'
                         ? officialRows.filter((row) => !row.statuses.every((s) => s.result === null)).length
                         : officialRows.length;
@@ -367,11 +402,11 @@ function genSeriesCalcFns(series, rows, ranks, officialRanks) {
                 }
                 const officialRanksNoTied = [];
                 let currentOfficialRank = 0;
-                for (let i = 0; i < officialRanks.length; i++) {
-                    officialRanksNoTied.push(officialRanks[i] === null ? null : ++currentOfficialRank);
+                for (let i = 0; i < filteredOfficialRanks.length; i++) {
+                    officialRanksNoTied.push(filteredOfficialRanks[i] === null ? null : ++currentOfficialRank);
                 }
                 return (row, index) => {
-                    if (row.user.official === false) {
+                    if (row.user.official === false || !filteredRows.find((r) => r.user.id === row.user.id)) {
                         return {
                             rank: null,
                             segmentIndex: null,
@@ -380,10 +415,10 @@ function genSeriesCalcFns(series, rows, ranks, officialRanks) {
                     const usingSegmentIndex = (seriesConfig.segments || []).findIndex((_, segIndex) => {
                         return usingEndpointRules
                             .map((e) => e[segIndex])
-                            .every((endpoints) => (noTied ? officialRanksNoTied : officialRanks)[index] <= endpoints);
+                            .every((endpoints) => (noTied ? officialRanksNoTied : filteredOfficialRanks)[index] <= endpoints);
                     });
                     return {
-                        rank: officialRanks[index],
+                        rank: filteredOfficialRanks[index],
                         segmentIndex: usingSegmentIndex > -1 ? usingSegmentIndex : null,
                     };
                 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@algoux/standard-ranklist-utils",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "author": "bLue",
   "keywords": [
     "standard ranklist",
@@ -15,7 +15,7 @@
   ],
   "scripts": {
     "dev": "NODE_OPTIONS='--es-module-specifier-resolution=node' ts-node --transpile-only src/index.ts",
-    "build": "tsc"
+    "build": "rimraf dist && tsc"
   },
   "dependencies": {
     "bcp-47-match": "^2.0.2",
@@ -24,7 +24,7 @@
     "textcolor": "^1.0.2"
   },
   "devDependencies": {
-    "@algoux/standard-ranklist": "^0.3.2",
+    "@algoux/standard-ranklist": "^0.3.3",
     "@types/node": "^16.18.38",
     "@types/semver": "^7.5.0",
     "@typescript-eslint/eslint-plugin": "^5.61.0",
@@ -32,6 +32,7 @@
     "eslint": "^8.44.0",
     "eslint-config-alloy": "^4.0.0",
     "prettier": "^2.7.1",
+    "rimraf": "^5.0.1",
     "ts-node": "^10.9.1",
     "typescript": "^4.9.5"
   },
@@ -46,5 +47,6 @@
   "bugs": {
     "url": "https://github.com/algoux/standard-ranklist-utils/issues"
   },
-  "homepage": "https://github.com/algoux/standard-ranklist-utils#readme"
+  "homepage": "https://github.com/algoux/standard-ranklist-utils#readme",
+  "srkSupportedVersions": ">=0.3.0 <=0.3.3"
 }

package/dist/dev.js

@@ -1,2 +0,0 @@
-"use strict";
-console.log('No dev test cases');