Fix types

frzyc · Aug 18, 2024 · b74cd58 · b74cd58
1 parent 59aeb39
commit b74cd58
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/libs/gi/formula/src/calculator.ts b/libs/gi/formula/src/calculator.ts
@@ -15,7 +15,7 @@ type MemRec<V> = Partial<Record<Member, V>>
 type CondInfo = MemRec<MemRec<Partial<Record<Sheet, Record<string, number>>>>>
 
 export type CalcMeta = PartialMeta & Info & { [reusable]?: true }
-type PartialMeta = {
+export type PartialMeta = {
   tag?: Tag
   op: 'const' | 'sum' | 'prod' | 'min' | 'max' | 'sumfrac' | 'res'
   ops: CalcResult<number, PartialMeta>[]

diff --git a/libs/gi/formula/src/formulaText.ts b/libs/gi/formula/src/formulaText.ts
@@ -1,6 +1,7 @@
 import type { CalcResult } from '@genshin-optimizer/pando/engine'
-import type { CalcMeta } from './calculator'
+import type { PartialMeta } from './calculator'
 
+type Output = PartialMeta
 type FormulaText = {
   name: string | undefined
   formula: string
@@ -10,8 +11,8 @@ type FormulaText = {
   deps: FormulaText[]
 }
 export function translate(
-  data: CalcResult<number, CalcMeta>,
-  cache: Map<CalcResult<number, CalcMeta>, FormulaText> = new Map()
+  data: CalcResult<number, Output>,
+  cache: Map<CalcResult<number, Output>, FormulaText> = new Map()
 ): FormulaText {
   const old = cache.get(data)
   if (old) return old
@@ -22,7 +23,7 @@ export function translate(
 
   const deps = new Set<FormulaText>()
   function getString(
-    ops: CalcResult<number, CalcMeta>[],
+    ops: CalcResult<number, Output>[],
     prec: number // precedence of the encompassing/parent term
   ): string[] {
     return ops.map((op) => {

diff --git a/libs/sr/formula/src/calculator.ts b/libs/sr/formula/src/calculator.ts
@@ -15,7 +15,7 @@ type MemRec<V> = Partial<Record<Member, V>>
 type CondInfo = MemRec<MemRec<Partial<Record<Sheet, Record<string, number>>>>>
 
 export type CalcMeta = PartialMeta & Info & { [reusable]?: true }
-type PartialMeta = {
+export type PartialMeta = {
   tag?: Tag
   op: 'const' | 'sum' | 'prod' | 'min' | 'max' | 'sumfrac' | 'res'
   ops: CalcResult<number, PartialMeta>[]

diff --git a/libs/sr/formula/src/formulaText.ts b/libs/sr/formula/src/formulaText.ts
@@ -1,11 +1,8 @@
 import type { CalcResult } from '@genshin-optimizer/pando/engine'
 import type { Tag } from './data/util'
+import type { PartialMeta } from './calculator'
 
-type Output = {
-  tag: Tag | undefined
-  op: 'const' | 'sum' | 'prod' | 'min' | 'max' | 'sumfrac'
-  ops: CalcResult<number, Output>[]
-}
+type Output = PartialMeta
 
 type FormulaText = {
   name: string | undefined