change removeMany to return the number of items deleted

maradotwebp · maradotwebp · commit 3afeaad94cc9 · 2023-10-19T21:30:03.000+02:00
diff --git a/packages/db/src/core/remove.ts b/packages/db/src/core/remove.ts
@@ -32,7 +32,7 @@ export function internalRemove<T extends Entity<T>, P extends PrimaryKeyOf<T>>(
   table: Table<T, P>,
   entity: Ids<T, P>
 ): Promise<boolean> {
-  return internalRemoveMany(table, [entity]);
+  return internalRemoveMany(table, [entity]).then((n) => n === 1);
 }
 
 /**
diff --git a/packages/db/src/core/removeMany.spec.ts b/packages/db/src/core/removeMany.spec.ts
@@ -24,30 +24,15 @@ beforeEach(async () => {
   await insertMany(userTable, users);
 });
 
-it("should return false if the primary key was not found", async () => {
-  const n = (await many(userTable)).length
-  const res = await removeMany(userTable, [{ id: "1337" }, { id: users[0].id }]);
-
-  expect(res).toBe(false);
-  expect((await many(userTable)).length).toBe(n-1);
-});
-
-it("should return false if one of the primary keys was not found", async () => {
-  const res = await removeMany(userTable, [{ id: "1" }, { id: "2" }, { id: "1337" }]);
-
-  expect(res).toBe(false);
-});
-
-it("should return true if the primary key was found", async () => {
-  const res = await removeMany(userTable, [{ id: "1" }]);
-
-  expect(res).toBe(true);
-});
-
-it("should return true if all of the primary keys were found", async () => {
-  const res = await removeMany(userTable, [{ id: "1" }, { id: "2" }, { id: "5" }]);
-
-  expect(res).toBe(true);
+it("should return the number of deleted entities", async () => {
+  const res = await removeMany(userTable, [
+    { id: "0" },
+    { id: "0" },
+    { id: "1" },
+    { id: "1337" },
+  ]);
+
+  expect(res).toBe(2);
 });
 
 it("should remove an entity", async () => {
@@ -67,7 +52,7 @@ it("should remove entities", async () => {
 it("should correctly remove an entity from a table with index", async () => {
   const firstUser = await one(userTable, { where: { id: "30" } });
 
-  await removeMany(userTable, [firstUser]);
+  await removeMany(userTable, [firstUser, { id: "1337" }]);
 
   const userWithIndex = await first(userTable, { where: { id: firstUser.id } });
   expect(userWithIndex).not.toStrictEqual(firstUser);
diff --git a/packages/db/src/core/removeMany.ts b/packages/db/src/core/removeMany.ts
@@ -7,7 +7,7 @@ import { Ids } from "./remove";
 /**
  * Removes the given `entities` from the `table`.
  *
- * @returns true if all entities were found and removed, false otherwise.
+ * @returns the number of removed entities.
  *
  * @example
  * const db = createDB();
@@ -19,7 +19,7 @@ import { Ids } from "./remove";
 export function removeMany<T extends Entity<T>, P extends PrimaryKeyOf<T>>(
   table: Table<T, P>,
   entities: Ids<T, P>[]
-): Promise<boolean> {
+): Promise<number> {
   return Promise.resolve(
     middleware<T, P, "removeMany">(
       table,
@@ -32,20 +32,17 @@ export function removeMany<T extends Entity<T>, P extends PrimaryKeyOf<T>>(
 export function internalRemoveMany<T extends Entity<T>, P extends PrimaryKeyOf<T>>(
   table: Table<T, P>,
   entities: Ids<T, P>[]
-): Promise<boolean> {
+): Promise<number> {
   const events: { entity: T }[] = [];
-  let allEntitiesRemoved = true;
+  let numEntitiesRemoved = 0;
   for (const entity of entities) {
     const primaryKeyProperty = table[BlinkKey].options.primary;
     const primaryKey = entity[primaryKeyProperty];
 
     const indexes = table[BlinkKey].storage.indexes;
     if (Object.keys(indexes).length > 0) {
       const item = table[BlinkKey].storage.primary.get(primaryKey);
-      if (!item) {
-        allEntitiesRemoved = false;
-        continue;
-      }
+      if (!item) continue;
       for (const property in indexes) {
         const btree = indexes[property]!;
         const key = item[property];
@@ -67,9 +64,9 @@ export function internalRemoveMany<T extends Entity<T>, P extends PrimaryKeyOf<T
     const hasDeleted = table[BlinkKey].storage.primary.delete(primaryKey);
     if (hasDeleted) {
       table[BlinkKey].storage.primary.totalItemSize--;
+      numEntitiesRemoved++;
     }
-    allEntitiesRemoved = allEntitiesRemoved && hasDeleted;
   }
   void table[BlinkKey].events.onRemove.dispatch(events);
-  return Promise.resolve(allEntitiesRemoved);
+  return Promise.resolve(numEntitiesRemoved);
 }

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ export function internalRemove<T extends Entity<T>, P extends PrimaryKeyOf<T>>(`
`32`	`32`	`table: Table<T, P>,`
`33`	`33`	`entity: Ids<T, P>`
`34`	`34`	`): Promise<boolean> {`
`35`		`- return internalRemoveMany(table, [entity]);`
	`35`	`+ return internalRemoveMany(table, [entity]).then((n) => n === 1);`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`/**`