Merge branch 'master' into age-withdraw

1 files changed, 13 insertions, 7 deletions

diff --git a/packages/idb-bridge/src/util/makeStoreKeyValue.ts b/packages/idb-bridge/src/util/makeStoreKeyValue.ts
index 4c7dab8d2..153cd9d81 100644
--- a/packages/idb-bridge/src/util/makeStoreKeyValue.ts
+++ b/packages/idb-bridge/src/util/makeStoreKeyValue.ts
@@ -75,19 +75,25 @@ function injectKey(
   return newValue;
 }
 
-export function makeStoreKeyValue(
-  value: any,
-  key: IDBValidKey | undefined,
-  currentKeyGenerator: number,
-  autoIncrement: boolean,
-  keyPath: IDBKeyPath | IDBKeyPath[] | null,
-): StoreKeyResult {
+export interface MakeStoreKvRequest {
+  value: any;
+  key: IDBValidKey | undefined;
+  currentKeyGenerator: number;
+  autoIncrement: boolean;
+  keyPath: IDBKeyPath | IDBKeyPath[] | null;
+}
+
+export function makeStoreKeyValue(req: MakeStoreKvRequest): StoreKeyResult {
+  const { keyPath, currentKeyGenerator, autoIncrement } = req;
+  let { key, value } = req;
+
   const haveKey = key !== null && key !== undefined;
   const haveKeyPath = keyPath !== null && keyPath !== undefined;
 
   // This models a decision table on (haveKey, haveKeyPath, autoIncrement)
 
   try {
+    // FIXME: Perf: only do this if we need to inject something.
     value = structuredClone(value);
   } catch (e) {
     throw new DataCloneError();