pangea-server 1.0.49 → 1.0.51

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

@@ -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, filters),
+            ...getIncludeAndWhere(model, include, undefined, 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,16 @@ 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.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 = {}) {
@@ -86,7 +86,7 @@ class Db {
         const deletedAtWhere = paranoid === 'deleted' ? { deletedAt: { [_1.Ops.not]: null } } : {};
         return {
             attributes: getFinalAttributes(attributes),
-            ...getIncludeAndWhere(model, include, { ...where, ...searchWhere, ...deletedAtWhere }),
+            ...getIncludeAndWhere(model, include, { withoutAttributes: !!attributes }, { ...where, ...searchWhere, ...deletedAtWhere }),
             ...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
             order: [...getFinalOrder(order), ...(!group ? [['createdAt', 'DESC']] : [])],
             paranoid: paranoid === 'active',
@@ -227,7 +227,7 @@ function convertWhereKeys(obj) {
     }
     return obj;
 }
-function getIncludeAndWhere(model, includeItems, where, relDepth = new Map()) {
+function getIncludeAndWhere(model, includeItems, config = {}, where, relDepth = new Map()) {
     const includeOptions = [];
     const cleanWhere = { ...where };
     for (const [relName, rel] of Object.entries(model.Relations)) {
@@ -247,9 +247,10 @@ function getIncludeAndWhere(model, includeItems, where, relDepth = new Map()) {
         includeOptions.push({
             model: relModel,
             as: relName,
+            attributes: !config.withoutAttributes ? undefined : [],
             required: rel.required,
             paranoid: rel.paranoid,
-            ...getIncludeAndWhere(relModel, nestedIncludeItems, relWhere, newRelDepth),
+            ...getIncludeAndWhere(relModel, nestedIncludeItems, config, relWhere, newRelDepth),
         });
     }
     return {

package/package.json

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