Merge branch 'master' into age-withdraw

1 files changed, 42 insertions, 24 deletions

diff --git a/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts b/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
index 971697021..c1216fe97 100644
--- a/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
+++ b/packages/idb-bridge/src/util/makeStoreKeyValue.test.ts
@@ -20,55 +20,73 @@ import { makeStoreKeyValue } from "./makeStoreKeyValue.js";
 test("basics", (t) => {
   let result;
 
-  result = makeStoreKeyValue({ name: "Florian" }, undefined, 42, true, "id");
+  result = makeStoreKeyValue({
+    value: { name: "Florian" },
+    key: undefined,
+    currentKeyGenerator: 42,
+    autoIncrement: true,
+    keyPath: "id",
+  });
   t.is(result.updatedKeyGenerator, 43);
   t.is(result.key, 42);
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 42);
 
-  result = makeStoreKeyValue(
-    { name: "Florian", id: 10 },
-    undefined,
-    5,
-    true,
-    "id",
-  );
+  result = makeStoreKeyValue({
+    value: { name: "Florian", id: 10 },
+    key: undefined,
+    currentKeyGenerator: 5,
+    autoIncrement: true,
+    keyPath: "id",
+  });
   t.is(result.updatedKeyGenerator, 11);
   t.is(result.key, 10);
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 10);
 
-  result = makeStoreKeyValue(
-    { name: "Florian", id: 5 },
-    undefined,
-    10,
-    true,
-    "id",
-  );
+  result = makeStoreKeyValue({
+    value: { name: "Florian", id: 5 },
+    key: undefined,
+    currentKeyGenerator: 10,
+    autoIncrement: true,
+    keyPath: "id",
+  });
   t.is(result.updatedKeyGenerator, 10);
   t.is(result.key, 5);
   t.is(result.value.name, "Florian");
   t.is(result.value.id, 5);
 
-  result = makeStoreKeyValue(
-    { name: "Florian", id: "foo" },
-    undefined,
-    10,
-    true,
-    "id",
-  );
+  result = makeStoreKeyValue({
+    value: { name: "Florian", id: "foo" },
+    key: undefined,
+    currentKeyGenerator: 10,
+    autoIncrement: true,
+    keyPath: "id",
+  });
   t.is(result.updatedKeyGenerator, 10);
   t.is(result.key, "foo");
   t.is(result.value.name, "Florian");
   t.is(result.value.id, "foo");
 
-  result = makeStoreKeyValue({ name: "Florian" }, "foo", 10, true, null);
+  result = makeStoreKeyValue({
+    value: { name: "Florian" },
+    key: "foo",
+    currentKeyGenerator: 10,
+    autoIncrement: true,
+    keyPath: null,
+  });
   t.is(result.updatedKeyGenerator, 10);
   t.is(result.key, "foo");
   t.is(result.value.name, "Florian");
   t.is(result.value.id, undefined);
 
-  result = makeStoreKeyValue({ name: "Florian" }, undefined, 10, true, null);
+  result = makeStoreKeyValue({
+    value: { name: "Florian" },
+    key: undefined,
+    currentKeyGenerator: 10,
+    autoIncrement: true,
+    keyPath: null,
+  });
   t.is(result.updatedKeyGenerator, 11);
   t.is(result.key, 10);
   t.is(result.value.name, "Florian");