fix: script types

tresabhi · Oct 20, 2024 · 76a8f83 · 76a8f83
1 parent 31f7618
commit 76a8f83
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/packages/scripts/src/averages.ts b/packages/scripts/src/averages.ts
@@ -1,15 +1,14 @@
 import {
  AverageDefinitions,
  AverageDefinitionsEntry,
- AverageDefinitionsEntrySubPartial,
  AverageDefinitionsManifest,
  IndividualTankStats,
  REGIONS,
  Region,
  Samples,
  averageDefinitionsAllStatsKeys,
  emptySamples,
- encodeProtobufToBase64,
+ encodePB64,
  getAccountInfo,
  getTankStats,
  idToRegion,
@@ -24,6 +23,17 @@ interface DataPoint {
  w: number;
 }
 
+type OptionalSecondLevel<T> = {
+ [P in keyof T]: P extends 'samples'
+ ? T[P]
+ : {
+ [K in keyof T[P]]?: T[P][K];
+ };
+};
+
+type AverageDefinitionsEntrySubPartial =
+ OptionalSecondLevel<AverageDefinitionsEntry>;
+
 const MINUTE = 60 * 1000;
 const HOUR = 60 * MINUTE;
 const DAY = 24 * HOUR;
@@ -225,11 +235,7 @@ async function postWork() {
  commitAssets('averages', [
  {
  path: `averages/${latest}.pb`,
- content: await encodeProtobufToBase64(
- 'average_definitions',
- 'blitzkit.AverageDefinitions',
- averageDefinitions,
- ),
+ content: encodePB64(AverageDefinitions, averageDefinitions),
  encoding: 'base64',
  },
  {