feat: make middleware in nukak-browser package return the affected ID…

…s and the count for all operations

packages/nukak-browser/src/querier/httpQuerier.ts

@@ -50,7 +50,7 @@ export class HttpQuerier implements ClientQuerier {
 
   updateOneById<E>(entity: Type<E>, id: IdValue<E>, payload: E, opts?: RequestOptions) {
     const basePath = this.getBasePath(entity);
-    return patch<number>(`${basePath}/${id}`, payload, opts);
+    return patch<typeof id>(`${basePath}/${id}`, payload, opts);
   }
 
   saveOne<E>(entity: Type<E>, payload: E, opts?: RequestOptions) {
@@ -65,13 +65,13 @@ export class HttpQuerier implements ClientQuerier {
   deleteOneById<E>(entity: Type<E>, id: IdValue<E>, opts: QueryOptions & RequestOptions = {}) {
     const basePath = this.getBasePath(entity);
     const qs = opts.softDelete ? stringifyQuery({ softDelete: opts.softDelete }) : '';
-    return remove<number>(`${basePath}/${id}${qs}`, opts);
+    return remove<typeof id>(`${basePath}/${id}${qs}`, opts);
   }
 
   deleteMany<E>(entity: Type<E>, qm: QuerySearch<E>, opts: QueryOptions & RequestOptions = {}) {
     const basePath = this.getBasePath(entity);
     const qs = stringifyQuery(opts.softDelete ? { ...qm, softDelete: opts.softDelete } : qm);
-    return remove<number>(`${basePath}${qs}`, opts);
+    return remove<IdValue<E>[]>(`${basePath}${qs}`, opts);
   }
 
   getRepository<E>(entity: Type<E>): ClientRepository<E> {

packages/nukak-browser/src/type/clientQuerier.ts

@@ -35,19 +35,13 @@ export interface ClientQuerier extends UniversalQuerier {
 
   insertOne<E>(entity: Type<E>, payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  insertMany?<E>(entity: Type<E>, payload: E[], opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>[]>>;
-
-  updateOneById<E>(entity: Type<E>, id: IdValue<E>, payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<number>>;
-
-  updateMany?<E>(entity: Type<E>, qm: QuerySearch<E>, payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<number>>;
+  updateOneById<E>(entity: Type<E>, id: IdValue<E>, payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
   saveOne<E>(entity: Type<E>, payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  saveMany?<E>(entity: Type<E>, payload: E[]): Promise<RequestSuccessResponse<IdValue<E>[]>>;
-
-  deleteOneById<E>(entity: Type<E>, id: IdValue<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<number>>;
+  deleteOneById<E>(entity: Type<E>, id: IdValue<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  deleteMany<E>(entity: Type<E>, qm: QuerySearch<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<number>>;
+  deleteMany<E>(entity: Type<E>, qm: QuerySearch<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<IdValue<E>[]>>;
 
   getRepository<E>(entity: Type<E>): ClientRepository<E>;
 }

packages/nukak-browser/src/type/clientRepository.ts

@@ -18,15 +18,9 @@ export interface ClientRepository<E> extends UniversalRepository<E> {
 
   insertOne(payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  insertMany?(payload: E[], opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>[]>>;
-
-  updateMany?(payload: E, qm: QuerySearch<E>, opts?: RequestOptions): Promise<RequestSuccessResponse<number>>;
-
   saveOne(payload: E, opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  saveMany?(payload: E[], opts?: RequestOptions): Promise<RequestSuccessResponse<IdValue<E>[]>>;
-
-  deleteOneById(id: IdValue<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<number>>;
+  deleteOneById(id: IdValue<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<IdValue<E>>>;
 
-  deleteMany(qm: QuerySearch<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<number>>;
+  deleteMany(qm: QuerySearch<E>, opts?: QueryOptions & RequestOptions): Promise<RequestSuccessResponse<IdValue<E>[]>>;
 }

packages/nukak-express/src/querierMiddleware.ts

@@ -44,7 +44,7 @@ export function buildQuerierRouter<E>(entity: Type<E>, opts: ExtraOptions) {
     const querier = await getQuerier();
     try {
       const data = await querier.findOne(entity, qm, project);
-      res.json({ data });
+      res.json({ data, count: data ? 1 : 0 });
     } catch (err: any) {
       next(err);
     } finally {
@@ -58,7 +58,7 @@ export function buildQuerierRouter<E>(entity: Type<E>, opts: ExtraOptions) {
     const querier = await getQuerier();
     try {
       const data = await querier.findOne(entity, qm, project);
-      res.json({ data });
+      res.json({ data, count: data ? 1 : 0 });
     } catch (err: any) {
       next(err);
     } finally {
@@ -85,7 +85,7 @@ export function buildQuerierRouter<E>(entity: Type<E>, opts: ExtraOptions) {
     const querier = await getQuerier();
     try {
       const count = await querier.count(entity, req.query);
-      res.json({ count });
+      res.json({ data: count, count });
     } catch (err: any) {
       next(err);
     } finally {
@@ -97,9 +97,9 @@ export function buildQuerierRouter<E>(entity: Type<E>, opts: ExtraOptions) {
     const querier = await getQuerier();
     try {
       await querier.beginTransaction();
-      const data = await querier.insertOne(entity, req.body);
+      const id = await querier.insertOne(entity, req.body);
       await querier.commitTransaction();
-      res.json({ data });
+      res.json({ data: id, count: id ? 1 : 0 });
     } catch (err: any) {
       await querier.rollbackTransaction();
       next(err);
@@ -146,9 +146,11 @@ export function buildQuerierRouter<E>(entity: Type<E>, opts: ExtraOptions) {
     const querier = await getQuerier();
     try {
       await querier.beginTransaction();
-      const count = await querier.deleteMany(entity, req.query, { softDelete: !!req.query.softDelete });
+      const founds = await querier.findMany(entity, req.query, [meta.id]);
+      const ids = founds.map((found) => found[meta.id]);
+      const count = await querier.deleteMany(entity, { $filter: { [meta.id]: ids } }, { softDelete: !!req.query.softDelete });
       await querier.commitTransaction();
-      res.json({ count });
+      res.json({ data: ids, count });
     } catch (err: any) {
       await querier.rollbackTransaction();
       next(err);

packages/nukak/src/querier/decorator/injectQuerier.ts

@@ -3,7 +3,7 @@ import { Key, Type } from '../../type/index.js';
 const metadataKey = Symbol('InjectQuerier');
 
 export function InjectQuerier() {
-  return (proto: { [k: string | symbol]: WeakMap<object, any> }, key: string, index: number) => {
+  return (proto: object, key: string, index: number) => {
     const { constructor } = proto;
 
     if (!proto[metadataKey]) {