update deps

anon/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/anon",
-  "version": "0.1.6",
+  "version": "0.1.7",
   "description": "Logic for anonymizing Pokémon Showdown battle simulator logs",
   "repository": "github:pkmn/stats",
   "license": "MIT",
@@ -16,11 +16,11 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.45",
+    "@pkmn/data": "^0.7.47",
     "@pkmn/protocol": "^0.6.12"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.7.45"
+    "@pkmn/dex": "^0.7.47"
   },
   "scripts": {
     "lint": "eslint --cache src --ext ts",

logs/src/checkpoints.ts

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import {Configuration, ID} from './config';
 import {CheckpointStorage} from './storage';
 

logs/src/config.ts

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import * as path from 'path';
 
 import * as util from './util';

logs/src/storage.ts

@@ -1,3 +1,4 @@
+/* eslint-disable */
 import * as path from 'path';
 
 import {Batch, Checkpoint} from './checkpoints';

logs/src/worker.ts

@@ -1,4 +1,4 @@
-
+/* eslint-disable */
 import * as threads from 'bthreads';
 
 import {Batch, Checkpoint} from './checkpoints';

package.json

@@ -4,8 +4,8 @@
   "license": "MIT",
   "dependencies": {
     "@pkmn/anon": "file:anon",
-    "@pkmn/data": "^0.7.45",
-    "@pkmn/dex": "^0.7.45",
+    "@pkmn/data": "^0.7.47",
+    "@pkmn/dex": "^0.7.47",
     "@pkmn/logs": "file:logs",
     "@pkmn/stats": "file:stats",
     "json-stringify-pretty-compact": "3.0.0",
@@ -17,17 +17,17 @@
     "@pkmn/sets": "^5.0.4"
   },
   "devDependencies": {
-    "@babel/preset-env": "^7.22.5",
+    "@babel/preset-env": "^7.22.9",
     "@babel/preset-typescript": "^7.22.5",
-    "@pkmn/eslint-config": "^3.3.0",
-    "@types/jest": "^29.5.2",
-    "@types/node": "^20.3.3",
-    "@typescript-eslint/eslint-plugin": "^5.60.1",
-    "@typescript-eslint/parser": "^5.60.1",
-    "eslint": "^8.44.0",
-    "eslint-plugin-import": "^2.27.5",
-    "eslint-plugin-jest": "^27.2.2",
-    "jest": "^29.5.0",
+    "@pkmn/eslint-config": "^5.1.0",
+    "@types/jest": "^29.5.3",
+    "@types/node": "^20.4.5",
+    "@typescript-eslint/eslint-plugin": "^6.2.1",
+    "@typescript-eslint/parser": "^6.2.1",
+    "eslint": "^8.46.0",
+    "eslint-plugin-import": "^2.28.0",
+    "eslint-plugin-jest": "^27.2.3",
+    "jest": "^29.6.2",
     "subpkg": "^4.1.0",
     "tsup": "^7.1.0",
     "typescript": "^5.1.6"

stats/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pkmn/stats",
-  "version": "0.2.8",
+  "version": "0.2.9",
   "description": "Logic for processing usage stats from Pokémon Showdown battle simulator logs",
   "repository": "github:pkmn/stats",
   "license": "MIT",
@@ -16,10 +16,10 @@
     "access": "public"
   },
   "dependencies": {
-    "@pkmn/data": "^0.7.45"
+    "@pkmn/data": "^0.7.47"
   },
   "devDependencies": {
-    "@pkmn/dex": "^0.7.45",
+    "@pkmn/dex": "^0.7.47",
     "json-stringify-pretty-compact": "3.0.0"
   },
   "scripts": {
@@ -50,6 +50,9 @@
     ]
   },
   "eslintConfig": {
-    "extends": "@pkmn"
+    "extends": "@pkmn",
+    "rules": {
+      "@typescript-eslint/no-redundant-type-constituents": "off"
+    }
   }
 }

stats/src/binary.ts

@@ -1,4 +1,4 @@
-import {Dex, Generation, ID, PokemonSet, StatsTable, TypeName, toID} from '@pkmn/data';
+import {Dex, Generation, ID, PokemonSet, TypeName, toID} from '@pkmn/data';
 
 import * as parser from './parser';
 import {weighting} from './util';
@@ -453,11 +453,13 @@ function round(v: number, p = 1e4) {
   return Math.round(v * p);
 }
 
+/*
 function bias(stats: StatsTable) {
   const [first, second] = Object.entries(stats).sort((a, b) => b[1] - a[1]);
   // TODO: convert this pair (eg. 'atkhp') to a number
   return first[0] > second[0] ? [first[0], second[0]] : [second[0], first[0]];
 }
+*/
 
 export const Binary = {Read, Write, Sizes, Log, Team, Stats, Display};
 

stats/src/display.ts

@@ -90,7 +90,7 @@ export const Display = new class {
 
     const q = Object.entries(stats.pokemon);
     const real = ['challengecup1v1', '1v1'].includes(format);
-    const total = Math.max(1.0, real ? stats.usage.real : stats.usage.weighted);
+    // const total = Math.max(1.0, real ? stats.usage.real : stats.usage.weighted);
     if (['randombattle', 'challengecup', 'challengcup1v1', 'seasonal'].includes(format)) {
       q.sort((a, b) => N(a[0]).localeCompare(N(b[0])));
     } else if (real) {

workflows/smogon/stats.ts

@@ -130,7 +130,8 @@ const StatsWorker = new class extends CombineWorker<Configuration, ApplyState, C
     };
   }
 
-  async processLog(log: string, state: ApplyState, shard?: string) {
+  // async processLog(log: string, state: ApplyState, shard?: string) {
+  async processLog(log: string, state: ApplyState) {
     const raw = JSON.parse(await this.storage.logs.read(log));
     const battle = Parser.parse(state.gen, state.format, raw);
     Stats.updateWeighted(