From de1e83de866a174a004f1236b3b8a06497b624ee Mon Sep 17 00:00:00 2001
From: Kai Ninomiya <kainino@chromium.org>
Date: Wed, 25 Oct 2023 16:28:46 -0700
Subject: [PATCH] nits

---
 src/common/framework/params_builder.ts | 7 +++++--
 src/common/internal/test_group.ts      | 8 +++++---
 src/common/util/types.ts               | 6 +++++-
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/common/framework/params_builder.ts b/src/common/framework/params_builder.ts
index 5124b7a8c68e..845d1cd2e92a 100644
--- a/src/common/framework/params_builder.ts
+++ b/src/common/framework/params_builder.ts
@@ -156,7 +156,7 @@ export class CaseParamsBuilder<CaseP extends {}>
         }
       }
 
-      yield [caseP as DeepReadonly<CaseP>, undefined];
+      yield [caseP as DeepReadonly<typeof caseP>, undefined];
     }
   }
 
@@ -303,7 +303,10 @@ export class SubcaseParamsBuilder<CaseP extends {}, SubcaseP extends {}>
 
       const subcases = Array.from(this.subcases(caseP));
       if (subcases.length) {
-        yield [caseP as DeepReadonly<CaseP>, subcases as DeepReadonly<SubcaseP>[]];
+        yield [
+          caseP as DeepReadonly<typeof caseP>,
+          subcases as DeepReadonly<typeof subcases[number]>[],
+        ];
       }
     }
   }
diff --git a/src/common/internal/test_group.ts b/src/common/internal/test_group.ts
index 92560e55aae0..6e13fbf47458 100644
--- a/src/common/internal/test_group.ts
+++ b/src/common/internal/test_group.ts
@@ -83,9 +83,11 @@ export function makeTestGroupForUnitTesting<F extends Fixture>(
 /** Parameter name for batch number (see also TestBuilder.batch). */
 const kBatchParamName = 'batch__';
 
-type TestFn<F extends Fixture, P extends {}> = (t: F & { params: P }) => Promise<void> | void;
+type TestFn<F extends Fixture, P extends {}> = (
+  t: F & { params: DeepReadonly<P> }
+) => Promise<void> | void;
 type BeforeAllSubcasesFn<S extends SubcaseBatchState, P extends {}> = (
-  s: S & { params: P }
+  s: S & { params: DeepReadonly<P> }
 ) => Promise<void> | void;
 
 export class TestGroup<F extends Fixture> implements TestGroupBuilder<F> {
@@ -217,7 +219,7 @@ interface TestBuilderWithParams<F extends Fixture, CaseP extends {}, SubcaseP ex
    * Set the test function.
    * @param fn the test function.
    */
-  fn(fn: TestFn<F, DeepReadonly<Merged<CaseP, SubcaseP>>>): void;
+  fn(fn: TestFn<F, Merged<CaseP, SubcaseP>>): void;
   /**
    * Mark the test as unimplemented.
    */
diff --git a/src/common/util/types.ts b/src/common/util/types.ts
index 4f01a016ed34..5714df73f00b 100644
--- a/src/common/util/types.ts
+++ b/src/common/util/types.ts
@@ -13,7 +13,10 @@ export type TypeEqual<X, Y> = (<T>() => T extends X ? 1 : 2) extends <T>() => T
 /* eslint-disable-next-line @typescript-eslint/no-unused-vars */
 export function assertTypeTrue<T extends true>() {}
 
-export type Primitive = string | number | boolean | undefined | null | Function | symbol;
+/**
+ * Deep version of the Readonly<> type, with support for tuples (up to length 7).
+ * <https://gist.github.com/masterkidan/7322752f569b1bba53e0426266768623>
+ */
 export type DeepReadonly<T> = T extends [infer A]
   ? DeepReadonlyObject<[A]>
   : T extends [infer A, infer B]
@@ -40,6 +43,7 @@ export type DeepReadonly<T> = T extends [infer A]
   ? DeepReadonlyArray<A>
   : DeepReadonlyObject<T>;
 
+type Primitive = string | number | boolean | undefined | null | Function | symbol;
 type DeepReadonlyArray<T> = ReadonlyArray<DeepReadonly<T>>;
 type DeepReadonlyObject<T> = { readonly [P in keyof T]: DeepReadonly<T[P]> };