pangea-server 1.0.63 → 1.0.65

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

@@ -12,7 +12,8 @@ type FindOneOptions = {
     order?: Order;
     paranoid?: boolean;
 };
-type AggregateOneOptions = {
+type AggregateOneOptions<BM extends BaseModel> = {
+    where?: Where<BM>;
     paranoid?: boolean;
 };
 type FindManyOptions<BM extends BaseModel> = {
@@ -36,7 +37,7 @@ 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>;
-    aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions): Promise<BM | null>;
+    aggregateOne<BM extends BaseModel>(model: BaseModelCtor<BM>, attributes: Attributes, options?: AggregateOneOptions<BM>): Promise<BM | null>;
     private __getFindOneBaseOptions;
     findMany<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyPagedOptions<BM>): Promise<BM[]>;
     count<BM extends BaseModel>(model: BaseModelCtor<BM>, options?: FindManyOptions<BM>): Promise<number>;

package/dist/database/db.class.js

@@ -37,7 +37,7 @@ class Db {
         return model.findOne({
             ...baseOptions,
             attributes: getFinalAttributes(model, attributes),
-            ...getInclude(model, { attributes }),
+            ...getInclude(model, { attributes, where: options.where }),
         });
     }
     __getFindOneBaseOptions(paranoid) {
@@ -74,15 +74,16 @@ class Db {
         return { instances, totalCount: instances.length };
     }
     async aggregateMany(model, config, options = {}) {
-        const baseOptions = this.__getFindManyBaseOptions(model, options);
+        const { attributes, group } = config;
+        const baseOptions = this.__getFindManyBaseOptions(model, { ...options, attributes });
         return model.findAll({
             ...baseOptions,
-            attributes: getFinalAttributes(model, config.attributes),
-            ...(config.group && { group: config.group.map((field) => formatField(model.name, field)) }),
+            attributes: getFinalAttributes(model, attributes),
+            ...(group && { group: group.map((field) => formatField(model.name, field)) }),
         });
     }
     __getFindManyBaseOptions(model, options = {}) {
-        const { where, searchFields, search, order, paranoid = true } = options;
+        const { attributes, where, searchFields, search, order, paranoid = true } = options;
         let searchWhere;
         if (searchFields?.length && search) {
             const searchWords = search.split(/\s+/).filter(Boolean);
@@ -96,7 +97,7 @@ class Db {
             };
         }
         return {
-            ...getInclude(model, { where: { ...where, ...searchWhere } }),
+            ...getInclude(model, { attributes, where: { ...where, ...searchWhere } }),
             order: getFinalOrder(order),
             paranoid,
             subQuery: false,
@@ -252,8 +253,6 @@ function getInclude(model, config = {}, relDepth = new Map()) {
         const maxDepth = rel.joinDepth;
         if (currentDepth >= maxDepth)
             continue;
-        if (!rel.eager)
-            continue;
         const relWhere = cleanWhere[relName];
         delete cleanWhere[relName];
         const newRelDepth = new Map(relDepth);

package/dist/database/decorators/relations.d.ts

@@ -1,6 +1,5 @@
 import type { GetModelFn } from '../database.types';
 type RelationOptions = {
-    eager?: boolean;
     required?: boolean;
     paranoid?: boolean;
     joinDepth?: number;

package/dist/database/decorators/relations.js

@@ -35,8 +35,8 @@ function getRelation(relationFn) {
             const { foreignKey, ...relOptions } = options;
             relationFn(getModelFn, { as: propertyName, ...(foreignKey && { foreignKey }) })(target, propertyName);
             const model = target.constructor;
-            const { eager = relationFn !== seq.HasMany, required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
-            model.AddRelation(propertyName, { getModelFn, eager, required, paranoid, joinDepth, ...restOptions });
+            const { required = relationFn === seq.BelongsTo ? !model.Columns[`${propertyName}Id`].allowNull : false, paranoid = relationFn !== seq.BelongsTo, joinDepth = 1, ...restOptions } = relOptions;
+            model.AddRelation(propertyName, { getModelFn, required, paranoid, joinDepth, ...restOptions });
         };
     };
 }

package/dist/database/models/base-model.class.d.ts

@@ -7,7 +7,6 @@ type Column = {
 type Columns = Record<string, Column>;
 type Relation = {
     getModelFn: GetModelFn;
-    eager: boolean;
     required: boolean;
     paranoid: boolean;
     joinDepth: number;

package/package.json

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