pangea-server 1.0.50 → 1.0.52

package/dist/database/db.class.d.ts

@@ -9,7 +9,7 @@ type IncludeItem = {
     active?: boolean;
     include?: IncludeItem[];
 };
-type Filters<BM extends BaseModel> = ModelId | Where<BM>;
+type Filters<BM extends BaseModel> = ModelId | Where<BM> | undefined;
 type Group = string[];
 type Order = Record<string, 'asc' | 'desc'>;
 type FindOneOptions = {
@@ -39,9 +39,9 @@ export declare class Db {
     constructor(tx: Tx);
     findOneOrNull<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM | null>;
     findOne<BM extends BaseModel>(model: BaseModelCtor<BM>, filters: Filters<BM>, options?: FindOneOptions): Promise<BM>;
-    findManyInstances<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
+    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
     count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;
-    findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
+    findManyWithCount<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<{
         instances: BM[];
         totalCount: number;
     }>;

package/dist/database/db.class.js

@@ -26,7 +26,7 @@ class Db {
         }
         return scopedModel.findOne({
             ...baseOptions,
-            ...getIncludeAndWhere(model, include, undefined, filters),
+            ...getIncludeAndWhere(model, include, { withoutAttributes: !!attributes }, filters),
             order: getFinalOrder(order),
         });
     }
@@ -36,7 +36,7 @@ class Db {
             helpers_1.AppError.ThrowEntityNotFound();
         return instance;
     }
-    async findManyInstances(model, options = {}) {
+    async findMany(model, options = {}) {
         const baseOptions = this.__getFindManyBaseOptions(model, options);
         const { page, pageSize } = options;
         if (page && pageSize) {
@@ -57,16 +57,13 @@ class Db {
         const baseOptions = this.__getFindManyBaseOptions(model, options);
         return model.count({ ...baseOptions, col: 'id', distinct: true });
     }
-    async findMany(model, options = {}) {
+    async findManyWithCount(model, options = {}) {
         const { page, pageSize } = options;
         if (page && pageSize) {
-            const [instances, totalCount] = await Promise.all([
-                this.findManyInstances(model, options),
-                this.count(model, options),
-            ]);
+            const [instances, totalCount] = await Promise.all([this.findMany(model, options), this.count(model, options)]);
             return { instances, totalCount };
         }
-        const instances = await this.findManyInstances(model, options);
+        const instances = await this.findMany(model, options);
         return { instances, totalCount: instances.length };
     }
     __getFindManyBaseOptions(model, options = {}) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "pangea-server",
   "description": "",
-  "version": "1.0.50",
+  "version": "1.0.52",
   "files": [
     "dist"
   ],