pangea-server 1.0.48 → 1.0.50

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

@@ -3,7 +3,7 @@ type AttributeField = string;
 type AttributeOp = 'COUNT' | 'SUM';
 type AttributeColumn = AttributeField | [AttributeOp, AttributeField];
 type AttributeAlias = string;
-type Attribute = AttributeField | Record<AttributeAlias, AttributeColumn>;
+type Attributes = Record<AttributeAlias, AttributeColumn>;
 type IncludeItem = {
     relation?: string;
     active?: boolean;
@@ -14,13 +14,13 @@ type Group = string[];
 type Order = Record<string, 'asc' | 'desc'>;
 type FindOneOptions = {
     scopes?: string[];
-    attributes?: Attribute[];
+    attributes?: Attributes;
     include?: IncludeItem[];
     order?: Order;
     paranoid?: boolean;
 };
 type FindManyOptions<BM extends BaseModel> = {
-    attributes?: Attribute[];
+    attributes?: Attributes;
     include?: IncludeItem[];
     where?: Where<BM>;
     searchFields?: string[];

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),
         });
     }
@@ -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',
@@ -190,22 +190,12 @@ exports.Db = Db;
 function getFinalAttributes(attributes) {
     if (!attributes)
         return;
-    const attt = attributes.map((attribute) => {
-        console.log('attribute: ', attribute);
-        if (typeof attribute === 'string')
-            return [(0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(attribute)), attribute];
-        console.log('--- [alias, column] --- ');
-        const [alias, column] = Object.entries(attribute)[0];
-        console.log(alias, ': ', column);
+    return Object.entries(attributes).map(([alias, column]) => {
         if (typeof column === 'string')
             return [(0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(column)), alias];
-        console.log('---  [op, field] --- ');
         const [op, field] = column;
-        console.log(op, ': ', field);
-        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)(field)), alias];
+        return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(field))), alias];
     });
-    console.log('attt: ', attt);
-    return attt;
 }
 function convertWhereKeys(obj) {
     if (Array.isArray(obj)) {
@@ -237,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)) {
@@ -257,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.48",
+  "version": "1.0.50",
   "files": [
     "dist"
   ],