allow modifying parameters in hooks

maradotwebp · maradotwebp · commit e4e81ddaa733 · 2023-03-05T23:26:49.000+01:00
diff --git a/packages/db/src/core/clear.spec.ts b/packages/db/src/core/clear.spec.ts
@@ -4,7 +4,7 @@ import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { insertMany } from "./insertMany";
 import { many } from "./many";
-import { isAction, use } from "./use";
+import { use } from "./use";
 
 let users: User[];
 let userTable: Table<User, "id">;
@@ -28,7 +28,7 @@ it("should execute clear hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await clear(userTable);
 
diff --git a/packages/db/src/core/clear.ts b/packages/db/src/core/clear.ts
@@ -13,7 +13,7 @@ import { Table } from "./createTable";
 export async function clear<T extends object, P extends keyof T>(
   table: Table<T, P>
 ): Promise<void> {
-  return middleware<T, P, "clear">(table, { action: "clear", params: [table] }, () =>
+  return middleware<T, P, "clear">(table, { action: "clear", params: [table] }, (table) =>
     internalClear(table)
   );
 }
diff --git a/packages/db/src/core/count.spec.ts b/packages/db/src/core/count.spec.ts
@@ -1,10 +1,9 @@
-import { analyze } from "../query/analyze";
 import { generateRandomUsers, User } from "../tests/utils";
 import { count } from "./count";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { insertMany } from "./insertMany";
-import { isAction, use } from "./use";
+import { use } from "./use";
 
 let users: User[];
 let userTable: Table<User, "id">;
@@ -58,7 +57,7 @@ it("should execute count hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await count(userTable);
 
diff --git a/packages/db/src/core/count.ts b/packages/db/src/core/count.ts
@@ -46,13 +46,13 @@ export async function count<T extends object, P extends keyof T>(
   filter?: Filter<T>,
   options: { exact: boolean } = { exact: true }
 ): Promise<number> {
-  return middleware(
+  return middleware<T, P, "count">(
     table,
     {
       action: "count",
       params: [table, filter, options],
     },
-    () => internalCount(table, filter, options)
+    (table, filter, options) => internalCount(table, filter, options)
   );
 }
 
diff --git a/packages/db/src/core/first.spec.ts b/packages/db/src/core/first.spec.ts
@@ -1,9 +1,8 @@
-import { User, generateRandomUsers } from "../tests/utils";
+import { generateRandomUsers, User } from "../tests/utils";
 import { clear } from "./clear";
-import { createDB, Database } from "./createDB";
+import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { first } from "./first";
-import { insert } from "./insert";
 import { insertMany } from "./insertMany";
 import { use } from "./use";
 
@@ -69,7 +68,7 @@ it("should execute first hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await first(userTable);
 
diff --git a/packages/db/src/core/first.ts b/packages/db/src/core/first.ts
@@ -36,8 +36,10 @@ export async function first<T extends object, P extends keyof T>(
   table: Table<T, P>,
   query?: Query<T, P>
 ): Promise<T | null> {
-  return middleware(table, { action: "first", params: [table, query] }, () =>
-    internalFirst(table, query)
+  return middleware<T, P, "first">(
+    table,
+    { action: "first", params: [table, query] },
+    (table, query) => internalFirst(table, query)
   );
 }
 
diff --git a/packages/db/src/core/insert.spec.ts b/packages/db/src/core/insert.spec.ts
@@ -59,7 +59,7 @@ it("should execute insert hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await insert(userTable, users[0]);
 
diff --git a/packages/db/src/core/insert.ts b/packages/db/src/core/insert.ts
@@ -18,8 +18,10 @@ export async function insert<T extends object, P extends keyof T>(
   table: Table<T, P>,
   entity: Create<T, P>
 ): Promise<T[P]> {
-  return middleware(table, { action: "insert", params: [table, entity] }, () =>
-    internalInsert(table, entity)
+  return middleware<T, P, "insert">(
+    table,
+    { action: "insert", params: [table, entity] },
+    (table, entity) => internalInsert(table, entity)
   );
 }
 
diff --git a/packages/db/src/core/insertMany.spec.ts b/packages/db/src/core/insertMany.spec.ts
@@ -1,5 +1,5 @@
 import { generateRandomUsers, User } from "../tests/utils";
-import { createDB, Database } from "./createDB";
+import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { insertMany } from "./insertMany";
 import { one } from "./one";
@@ -56,7 +56,7 @@ it("should execute insertMany hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await insertMany(userTable, [users[0], users[1]]);
 
diff --git a/packages/db/src/core/insertMany.ts b/packages/db/src/core/insertMany.ts
@@ -24,8 +24,10 @@ export async function insertMany<T extends object, P extends keyof T>(
   table: Table<T, P>,
   entities: Create<T, P>[]
 ): Promise<T[P][]> {
-  return middleware(table, { action: "insertMany", params: [table, entities] }, () =>
-    internalInsertMany(table, entities)
+  return middleware<T, P, "insertMany">(
+    table,
+    { action: "insertMany", params: [table, entities] },
+    (table, entities) => internalInsertMany(table, entities)
   );
 }
 
diff --git a/packages/db/src/core/many.spec.ts b/packages/db/src/core/many.spec.ts
@@ -1,9 +1,9 @@
-import { User, generateRandomUsers, sortById } from "../tests/utils";
+import { generateRandomUsers, sortById, User } from "../tests/utils";
 import { clear } from "./clear";
-import { createDB, Database } from "./createDB";
+import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
-import { many } from "./many";
 import { insertMany } from "./insertMany";
+import { many } from "./many";
 import { use } from "./use";
 
 let users: User[];
@@ -62,7 +62,7 @@ it("should execute many hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await many(userTable);
 
diff --git a/packages/db/src/core/many.ts b/packages/db/src/core/many.ts
@@ -45,8 +45,10 @@ export async function many<T extends object, P extends keyof T>(
   table: Table<T, P>,
   query?: Query<T, P>
 ): Promise<T[]> {
-  return middleware(table, { action: "many", params: [table, query] }, () =>
-    internalMany(table, query)
+  return middleware<T, P, "many">(
+    table,
+    { action: "many", params: [table, query] },
+    (table, query) => internalMany(table, query)
   );
 }
 
diff --git a/packages/db/src/core/one.spec.ts b/packages/db/src/core/one.spec.ts
@@ -1,8 +1,8 @@
-import { User, generateRandomUsers } from "../tests/utils";
+import { generateRandomUsers, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
-import { one } from "./one";
 import { insertMany } from "./insertMany";
+import { one } from "./one";
 import { use } from "./use";
 
 let users: User[];
@@ -44,7 +44,7 @@ it("should execute one hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await one(userTable, { where: { id: "0" } });
 
diff --git a/packages/db/src/core/one.ts b/packages/db/src/core/one.ts
@@ -20,8 +20,10 @@ export async function one<T extends object, P extends keyof T>(
   table: Table<T, P>,
   query: Query<T, P>
 ): Promise<T> {
-  return middleware(table, { action: "one", params: [table, query] }, () =>
-    internalOne(table, query)
+  return middleware<T, P, "one">(
+    table,
+    { action: "one", params: [table, query] },
+    (table, query) => internalOne(table, query)
   );
 }
 
diff --git a/packages/db/src/core/remove.spec.ts b/packages/db/src/core/remove.spec.ts
@@ -2,10 +2,9 @@ import { generateRandomUsers, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { first } from "./first";
-import { insert } from "./insert";
-import { remove } from "./remove";
 import { insertMany } from "./insertMany";
 import { one } from "./one";
+import { remove } from "./remove";
 import { use } from "./use";
 
 let users: User[];
@@ -60,7 +59,7 @@ it("should execute remove hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await remove(userTable, firstUser);
 
diff --git a/packages/db/src/core/remove.ts b/packages/db/src/core/remove.ts
@@ -18,8 +18,10 @@ export async function remove<T extends object, P extends keyof T>(
   table: Table<T, P>,
   entity: Ids<T, P>
 ): Promise<boolean> {
-  return middleware(table, { action: "remove", params: [table, entity] }, () =>
-    internalRemove(table, entity)
+  return middleware<T, P, "remove">(
+    table,
+    { action: "remove", params: [table, entity] },
+    (table, entity) => internalRemove(table, entity)
   );
 }
 
diff --git a/packages/db/src/core/removeMany.spec.ts b/packages/db/src/core/removeMany.spec.ts
@@ -1,4 +1,4 @@
-import { User, generateRandomUsers } from "../tests/utils";
+import { generateRandomUsers, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { first } from "./first";
@@ -79,7 +79,7 @@ it("should execute removeMany hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await removeMany(userTable, [firstUser]);
 
diff --git a/packages/db/src/core/removeMany.ts b/packages/db/src/core/removeMany.ts
@@ -20,8 +20,10 @@ export async function removeMany<T extends object, P extends keyof T>(
   table: Table<T, P>,
   entities: Ids<T, P>[]
 ): Promise<boolean> {
-  return middleware(table, { action: "removeMany", params: [table, entities] }, () =>
-    internalRemoveMany(table, entities)
+  return middleware<T, P, "removeMany">(
+    table,
+    { action: "removeMany", params: [table, entities] },
+    (table, entities) => internalRemoveMany(table, entities)
   );
 }
 
diff --git a/packages/db/src/core/removeWhere.spec.ts b/packages/db/src/core/removeWhere.spec.ts
@@ -1,4 +1,4 @@
-import { User, generateRandomUsers, sortById } from "../tests/utils";
+import { generateRandomUsers, sortById, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { insertMany } from "./insertMany";
@@ -43,7 +43,7 @@ it("should execute removeWhere hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await removeWhere(userTable, { where: { name: "Alice" } });
 
diff --git a/packages/db/src/core/removeWhere.ts b/packages/db/src/core/removeWhere.ts
@@ -23,8 +23,10 @@ export async function removeWhere<T extends object, P extends keyof T>(
   table: Table<T, P>,
   filter: Filter<T>
 ): Promise<void> {
-  return middleware(table, { action: "removeWhere", params: [table, filter] }, () =>
-    internalRemoveWhere(table, filter)
+  return middleware<T, P, "removeWhere">(
+    table,
+    { action: "removeWhere", params: [table, filter] },
+    (table, filter) => internalRemoveWhere(table, filter)
   );
 }
 
diff --git a/packages/db/src/core/update.spec.ts b/packages/db/src/core/update.spec.ts
@@ -1,7 +1,6 @@
-import { User, generateRandomUsers } from "../tests/utils";
+import { generateRandomUsers, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
-import { insert } from "./insert";
 import { insertMany } from "./insertMany";
 import { one } from "./one";
 import { update } from "./update";
@@ -60,7 +59,7 @@ it("should execute update hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await update(userTable, { id: "0", name: "Alice the II.", age: 25 });
 
diff --git a/packages/db/src/core/update.ts b/packages/db/src/core/update.ts
@@ -18,8 +18,10 @@ export async function update<T extends object, P extends keyof T>(
   table: Table<T, P>,
   diff: Diff<T, P>
 ): Promise<void> {
-  return middleware(table, { action: "update", params: [table, diff] }, () =>
-    internalUpdate(table, diff)
+  return middleware<T, P, "update">(
+    table,
+    { action: "update", params: [table, diff] },
+    (table, diff) => internalUpdate(table, diff)
   );
 }
 
diff --git a/packages/db/src/core/updateMany.spec.ts b/packages/db/src/core/updateMany.spec.ts
@@ -1,7 +1,6 @@
-import { User, generateRandomUsers } from "../tests/utils";
-import { createDB, Database } from "./createDB";
+import { generateRandomUsers, User } from "../tests/utils";
+import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
-import { insert } from "./insert";
 import { insertMany } from "./insertMany";
 import { one } from "./one";
 import { updateMany } from "./updateMany";
@@ -75,7 +74,7 @@ it("should execute updateMany hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await updateMany(userTable, [{ id: "0", name: "Alice the II.", age: 25 }]);
 
diff --git a/packages/db/src/core/updateMany.ts b/packages/db/src/core/updateMany.ts
@@ -26,8 +26,10 @@ export async function updateMany<T extends object, P extends keyof T>(
   table: Table<T, P>,
   diffs: Diff<T, P>[]
 ): Promise<void> {
-  return middleware(table, { action: "updateMany", params: [table, diffs] }, () =>
-    internalUpdateMany(table, diffs)
+  return middleware<T, P, "updateMany">(
+    table,
+    { action: "updateMany", params: [table, diffs] },
+    (table, diffs) => internalUpdateMany(table, diffs)
   );
 }
 
diff --git a/packages/db/src/core/updateWhere.spec.ts b/packages/db/src/core/updateWhere.spec.ts
@@ -1,9 +1,8 @@
-import { User, generateRandomUsers, sortById } from "../tests/utils";
+import { generateRandomUsers, sortById, User } from "../tests/utils";
 import { createDB } from "./createDB";
 import { createTable, Table } from "./createTable";
 import { insertMany } from "./insertMany";
 import { many } from "./many";
-import { one } from "./one";
 import { updateWhere } from "./updateWhere";
 import { use } from "./use";
 
@@ -69,7 +68,7 @@ it("should execute updateWhere hooks", async () => {
 
   use(userTable, (ctx) => {
     fn(ctx.action);
-    return ctx.next();
+    return ctx.next(...ctx.params);
   });
   await updateWhere(userTable, { where: { age: { gte: 0 } } }, (item) => {
     return { ...item, age: item.age ? item.age + 1 : item.age };
diff --git a/packages/db/src/core/updateWhere.ts b/packages/db/src/core/updateWhere.ts
diff --git a/packages/db/src/core/use.spec.ts b/packages/db/src/core/use.spec.ts
diff --git a/packages/db/src/events/Middleware.spec.ts b/packages/db/src/events/Middleware.spec.ts
diff --git a/packages/db/src/events/Middleware.ts b/packages/db/src/events/Middleware.ts
diff --git a/packages/db/src/events/types.ts b/packages/db/src/events/types.ts

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ import { Table } from "./createTable";`
`13`	`13`	`export async function clear<T extends object, P extends keyof T>(`
`14`	`14`	`table: Table<T, P>`
`15`	`15`	`): Promise<void> {`
`16`		`- return middleware<T, P, "clear">(table, { action: "clear", params: [table] }, () =>`
	`16`	`+ return middleware<T, P, "clear">(table, { action: "clear", params: [table] }, (table) =>`
`17`	`17`	`internalClear(table)`
`18`	`18`	`);`
`19`	`19`	`}`