pangea-server 1.0.53 → 1.0.54

package/dist/database/db.class.js

@@ -214,8 +214,7 @@ function convertWhereKeys(obj) {
                 const parts = inner.split('.');
                 if (parts.length >= 2) {
                     const last = parts.pop();
-                    const transformed = (0, pangea_helpers_1.camelToSnake)(last);
-                    newKey = `$${[...parts, transformed].join('.')}$`;
+                    newKey = `$${[...parts.map((part) => (0, pangea_helpers_1.camelToSnake)(part)), (0, pangea_helpers_1.camelToSnake)(last)].join('.')}$`;
                 }
             }
             newObj[newKey] = convertWhereKeys(value);
@@ -243,8 +242,8 @@ function getIncludeAndWhere(model, includeItems, config = {}, where, relDepth =
         const relModel = rel.getModelFn();
         includeOptions.push({
             model: relModel,
-            as: relName,
-            // attributes: !config.withoutAttributes ? undefined : [],
+            as: rel.as,
+            attributes: !config.withoutAttributes ? undefined : [],
             required: rel.required,
             paranoid: rel.paranoid,
             ...getIncludeAndWhere(relModel, nestedIncludeItems, config, relWhere, newRelDepth),

package/dist/database/decorators/relations.js

@@ -25,6 +25,8 @@ 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);
@@ -33,10 +35,11 @@ function getRelation(relationFn) {
     return function (getModelFn, options = {}) {
         return function (target, propertyName) {
             const { foreignKey, ...relOptions } = options;
-            relationFn(getModelFn, { as: propertyName, ...(foreignKey && { foreignKey }) })(target, propertyName);
+            const as = (0, pangea_helpers_1.camelToSnake)(propertyName);
+            relationFn(getModelFn, { as, ...(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 });
+            model.AddRelation(propertyName, { as, getModelFn, eager, required, paranoid, joinDepth, ...restOptions });
         };
     };
 }

package/dist/database/decorators/table.js

@@ -35,6 +35,7 @@ function Table(tableName, options = {}) {
         const allIndexes = [...tableIndexes, ...columnIndexes];
         seq.Table({
             tableName,
+            modelName: (0, pangea_helpers_1.camelToSnake)(target.name),
             charset: 'utf8mb4',
             collate: 'utf8mb4_general_ci',
             underscored: true,

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

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

package/package.json

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