@platformatic/sql-mapper 0.30.1 → 0.31.1

package/mapper.d.ts

@@ -242,13 +242,14 @@ export interface Entity<EntityFields = any> {
   count: Count,
 }
 
+type EntityHook<T extends (...args: any) => any> = (original: T, ...options: Parameters<T>) => ReturnType<T>;
 
 export interface EntityHooks<EntityFields = any> {
-  find?: Find<EntityFields>,
-  insert?: Insert<EntityFields>,
-  save?: Save<EntityFields>,
-  delete?: Delete<EntityFields>,
-  count?: Count,
+  find?: EntityHook<Find<EntityFields>>,
+  insert?: EntityHook<Insert<EntityFields>>,
+  save?: EntityHook<Save<EntityFields>>,
+  delete?: EntityHook<Delete<EntityFields>>,
+  count?: EntityHook<Count>,
 }
 
 export interface SQLMapperPluginOptions {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platformatic/sql-mapper",
-  "version": "0.30.1",
+  "version": "0.31.1",
   "description": "A data mapper utility for SQL databases",
   "main": "mapper.js",
   "types": "mapper.d.ts",
@@ -29,7 +29,7 @@
     "camelcase": "^6.3.0",
     "fastify-plugin": "^4.5.0",
     "inflected": "^2.1.0",
-    "@platformatic/types": "0.30.1"
+    "@platformatic/types": "0.31.1"
   },
   "tsd": {
     "directory": "test/types"

package/test/types/mapper.test-d.ts

@@ -42,11 +42,11 @@ expectType<Partial<EntityFields>[]>(await entity.delete())
 expectType<number>(await entity.count())
 
 const entityHooks: EntityHooks = {
-  async find(options: any): Promise<any[]> { return [] },
-  async insert(options: { inputs: any[], fields?: string[] }): Promise<any[]> { return [] },
-  async save(options: { input: any, fields?: string[] }): Promise<any> { return {} },
-  async delete(options?: { where: WhereCondition, fields: string[] }): Promise<any[]> { return [] },
-  async count(options?: { where?: WhereCondition }): Promise<number> { return 0 },
+  async find(originalFind: typeof entity.find, ...options: Parameters<typeof entity.find>): ReturnType<typeof entity.find> { return [] },
+  async insert(originalInsert: typeof entity.insert, ...options: Parameters<typeof entity.insert>): ReturnType<typeof entity.insert> { return [] },
+  async save(originalSave: typeof entity.save, ...options: Parameters<typeof entity.save>): ReturnType<typeof entity.save> { return {} },
+  async delete(originalDelete: typeof entity.delete, ...options: Parameters<typeof entity.delete>): ReturnType<typeof entity.delete> { return [] },
+  async count(originalCount: typeof entity.count, ...options: Parameters<typeof entity.count>): ReturnType<typeof entity.count> { return 0 },
 }
 expectType<EntityHooks>(entityHooks)
 expectType<SQLMapperPluginInterface>(await connect({ connectionString: '' }))