update function signatures

inker · Sep 17, 2023 · ec3edbc · ec3edbc
1 parent bbfba25
commit ec3edbc
Show file tree

Hide file tree

Showing 8 changed files with 60 additions and 18 deletions.
diff --git a/src/engine/backtracking/gs.ts b/src/engine/backtracking/gs.ts
@@ -35,24 +35,31 @@ function anyGroupPossible<T>(
   return newGroups.some((_, i) => anyGroupPossible(newSource, newGroups, newPicked, i, predicate))
 }
 
-export const allPossibleGroups = <T>(
+interface Input<T> {
   pots: ReadonlyDoubleArray<T>,
   groups: ReadonlyDoubleArray<T>,
   picked: T,
   predicate: Predicate<T>,
-) => {
+}
+
+export const allPossibleGroups = <T>({
+  pots,
+  groups,
+  picked,
+  predicate,
+}: Input<T>) => {
   const source = pots.flat()
   return groups
     .map((_, i) => i)
     .filter(i => anyGroupPossible(source, groups, picked, i, predicate))
 }
 
-export const firstPossibleGroup = <T>(
-  pots: ReadonlyDoubleArray<T>,
-  groups: ReadonlyDoubleArray<T>,
-  picked: T,
-  predicate: Predicate<T>,
-) => {
+export const firstPossibleGroup = <T>({
+  pots,
+  groups,
+  picked,
+  predicate,
+}: Input<T>) => {
   const source = pots.flat()
   return groups.findIndex((_, i) => anyGroupPossible(source, groups, picked, i, predicate))
 }
diff --git a/src/engine/backtracking/ko.ts b/src/engine/backtracking/ko.ts
@@ -1,4 +1,5 @@
 import { type Predicate } from 'engine/backtracking/gs'
+import { type FixedArray } from 'model/types'
 
 type OneOrTwo<T> = readonly [T] | readonly [T, T]
 
@@ -38,12 +39,18 @@ function anyRunnersUp<T>(
     .some(item => anyGroupWinners(item, [groupWinners, newRunnersUp], newMatchups, predicate))
 }
 
-// eslint-disable-next-line import/prefer-default-export
-export const getPossiblePairings = <T>(
-  [groupWinners, runnersUp]: readonly (readonly T[])[],
+interface Input<T> {
+  pots: FixedArray<readonly T[], 2>,
   matchups: readonly OneOrTwo<T>[],
   predicate: Predicate<T>,
-): number[] =>
+}
+
+// eslint-disable-next-line import/prefer-default-export
+export const getPossiblePairings = <T>({
+  pots: [groupWinners, runnersUp],
+  matchups,
+  predicate,
+}: Input<T>): number[] =>
     groupWinners
       .map((item, i) => i)
       .filter(i => anyGroupWinners(groupWinners[i], [groupWinners, runnersUp], matchups, predicate))
diff --git a/src/pages/cl/gs/allPossibleGroupsWorker.ts b/src/pages/cl/gs/allPossibleGroupsWorker.ts
@@ -30,7 +30,12 @@ const func = (data: GsWorkerData<Team>) => {
   } = data
 
   const predicate = getPredicateMemoized(season, pots.length)
-  return allPossibleGroups(pots, groups, selectedTeam, predicate)
+  return allPossibleGroups({
+    pots,
+    groups,
+    picked: selectedTeam,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>

diff --git a/src/pages/cl/gs/firstPossibleGroupWorker.ts b/src/pages/cl/gs/firstPossibleGroupWorker.ts
@@ -30,7 +30,12 @@ const func = (data: GsWorkerData<Team>) => {
   } = data
 
   const predicate = getPredicateMemoized(season, pots.length)
-  return firstPossibleGroup(pots, groups, selectedTeam, predicate)
+  return firstPossibleGroup({
+    pots,
+    groups,
+    picked: selectedTeam,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>

diff --git a/src/pages/cl/ko/worker.ts b/src/pages/cl/ko/worker.ts
@@ -28,7 +28,11 @@ const func = (data: KoWorkerData<Team>) => {
   } = data
 
   const predicate = getPredicateMemoized(season)
-  return getPossiblePairings(pots, matchups, predicate)
+  return getPossiblePairings({
+    pots,
+    matchups,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>

diff --git a/src/pages/el/gs/worker.ts b/src/pages/el/gs/worker.ts
@@ -30,7 +30,12 @@ const func = (data: GsWorkerData<Team>) => {
   } = data
 
   const predicate = getPredicateMemoized(season, pots.length)
-  return firstPossibleGroup(pots, groups, selectedTeam, predicate)
+  return firstPossibleGroup({
+    pots,
+    groups,
+    picked: selectedTeam,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>

diff --git a/src/pages/el/ko/worker.ts b/src/pages/el/ko/worker.ts
@@ -28,7 +28,11 @@ const func = (data: KoWorkerData<Team>) => {
   } = data
 
   const predicate = getPredicateMemoized(season)
-  return getPossiblePairings(pots, matchups, predicate)
+  return getPossiblePairings({
+    pots,
+    matchups,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>

diff --git a/src/pages/wc/gs/worker.ts b/src/pages/wc/gs/worker.ts
@@ -38,7 +38,12 @@ const func = (data: GsWorkerData<Team>) => {
     ...groups.flat(),
   ]
   const predicate = getPredicateMemoized(season, teams)
-  return firstPossibleGroup(pots, groups, selectedTeam, predicate)
+  return firstPossibleGroup({
+    pots,
+    groups,
+    picked: selectedTeam,
+    predicate,
+  })
 }
 
 export type Func = ExposedFuncType<typeof func>