pangea-server 1.0.62 → 1.0.64

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) {
@@ -78,9 +78,7 @@ class Db {
         return model.findAll({
             ...baseOptions,
             attributes: getFinalAttributes(model, config.attributes),
-            ...(config.group && {
-                group: config.group.map((field) => (field.includes('.') ? field : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(field)}`)),
-            }),
+            ...(config.group && { group: config.group.map((field) => formatField(model.name, field)) }),
         });
     }
     __getFindManyBaseOptions(model, options = {}) {
@@ -198,17 +196,22 @@ class Db {
 }
 exports.Db = Db;
 // internal functions
+function formatField(modelName, field) {
+    if (field.includes('.')) {
+        const parts = field.split('.');
+        const last = parts.pop();
+        return [...parts, (0, pangea_helpers_1.camelToSnake)(last)].join('.');
+    }
+    return `${modelName}.${(0, pangea_helpers_1.camelToSnake)(field)}`;
+}
 function getFinalAttributes(model, attributes) {
     if (!attributes)
         return;
     return Object.entries(attributes).map(([alias, column]) => {
-        if (typeof column === 'string') {
-            const field = column.includes('.') ? column : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(column)}`;
-            return [(0, sequelize_1.col)(field), alias];
-        }
-        const [op, fieldName] = column;
-        const field = fieldName.includes('.') ? fieldName : `${model.name}.${(0, pangea_helpers_1.camelToSnake)(fieldName)}`;
-        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)(field)), alias];
+        if (typeof column === 'string')
+            return [(0, sequelize_1.col)(formatField(model.name, column)), alias];
+        const [op, field] = column;
+        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)(formatField(model.name, field))), alias];
     });
 }
 function convertWhereKeys(obj) {
@@ -231,7 +234,7 @@ function convertWhereKeys(obj) {
                 const parts = inner.split('.');
                 if (parts.length >= 2) {
                     const last = parts.pop();
-                    newKey = `$${[...parts.map((part) => (0, pangea_helpers_1.camelToSnake)(part)), (0, pangea_helpers_1.camelToSnake)(last)].join('.')}$`;
+                    newKey = `$${[...parts, (0, pangea_helpers_1.camelToSnake)(last)].join('.')}$`;
                 }
             }
             newObj[newKey] = convertWhereKeys(value);
@@ -258,7 +261,7 @@ function getInclude(model, config = {}, relDepth = new Map()) {
         const relModel = rel.getModelFn();
         includeOptions.push({
             model: relModel,
-            as: rel.alias,
+            as: relName,
             attributes: !config.attributes ? undefined : [],
             required: rel.required,
             paranoid: rel.paranoid,

package/dist/database/decorators/relations.js

@@ -25,8 +25,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HasMany = exports.HasOne = exports.BelongsTo = void 0;
 const seq = __importStar(require("sequelize-typescript"));
-// helpers
-const pangea_helpers_1 = require("pangea-helpers");
 exports.BelongsTo = getRelation(seq.BelongsTo);
 exports.HasOne = getRelation(seq.HasOne);
 exports.HasMany = getRelation(seq.HasMany);
@@ -35,11 +33,10 @@ function getRelation(relationFn) {
     return function (getModelFn, options = {}) {
         return function (target, propertyName) {
             const { foreignKey, ...relOptions } = options;
-            const alias = (0, pangea_helpers_1.camelToSnake)(propertyName);
-            relationFn(getModelFn, { as: alias, ...(foreignKey && { foreignKey }) })(target, propertyName);
+            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, { alias, getModelFn, eager, required, paranoid, joinDepth, ...restOptions });
+            model.AddRelation(propertyName, { getModelFn, eager, required, paranoid, joinDepth, ...restOptions });
         };
     };
 }

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

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

package/package.json

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