pangea-server 1.0.3 → 1.0.5

package/dist/authentication/base-auth.class.d.ts

@@ -4,6 +4,7 @@ export declare abstract class BaseAuth<AM extends AuthMap> {
     constructor(authUsers: AuthUsers<AM>);
     free(): void;
     notSetYet(): void;
+    notAllowed(): void;
     isUserAuth<T extends UserType<AM>>(type: T): NonNullable<AuthUsers<AM>[T]>;
     isAnyUserAuth<const T extends readonly UserType<AM>[]>(types: T): { [I in keyof T]: InstanceType<AM[T[I]]> | null; };
 }

package/dist/authentication/base-auth.class.js

@@ -13,6 +13,9 @@ class BaseAuth {
     notSetYet() {
         (0, helpers_1.printWarning)('authentication', 'auth not set yet');
     }
+    notAllowed() {
+        helpers_1.AppError.ThrowUnauthorized();
+    }
     isUserAuth(type) {
         const user = this.__authUsers[type];
         if (!user)

package/dist/database/db-client.js

@@ -26,13 +26,9 @@ function initDatabase(models, seeds, config = {}) {
             const dbClient = getDbClient();
             await dbClient.authenticate();
             (0, helpers_1.printSuccess)('database', 'database connected');
-            if ((0, helpers_1.getEnvStr)('ENVIRONMENT') !== 'production') {
-                if ((0, helpers_1.getEnvBool)('DB_DROP_TABLES'))
-                    await (0, seed_helpers_1.dropTables)();
-                await (0, seed_helpers_1.syncTables)();
-                if ((0, helpers_1.getEnvBool)('DB_SEED_TABLES'))
-                    await (0, seed_helpers_1.seedTables)(models, seeds);
-            }
+            if ((0, helpers_1.getEnvStr)('ENVIRONMENT') !== 'development')
+                return;
+            await buildDatabase(models, seeds);
         }
         catch (err) {
             (0, helpers_1.printDanger)('database', err);
@@ -67,3 +63,10 @@ function logQuery(sql, timing) {
     const level = timing <= 50 ? 'success' : timing <= 200 ? 'warning' : 'danger';
     logFns[level]('timing', `${timing} ms`);
 }
+async function buildDatabase(models, seeds) {
+    if ((0, helpers_1.getEnvBool)('DB_DROP_TABLES'))
+        await (0, seed_helpers_1.dropTables)();
+    await (0, seed_helpers_1.syncTables)();
+    if ((0, helpers_1.getEnvBool)('DB_SEED_TABLES'))
+        await (0, seed_helpers_1.seedTables)(models, seeds);
+}

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 = [AttributeColumn, AttributeAlias];
+type Attribute = AttributeField | Record<AttributeAlias, AttributeColumn>;
 type IncludeItem = {
     relation?: string;
     active?: boolean;

package/dist/database/db.class.js

@@ -48,13 +48,9 @@ class Db {
         const deletedAtWhere = paranoid === 'deleted' ? { deletedAt: { [_1.Ops.not]: null } } : {};
         const baseOptions = {
             attributes: getFinalAttributes(attributes),
-            ...getIncludeAndWhere(model, include, {
-                ...where,
-                ...searchWhere,
-                ...deletedAtWhere,
-            }),
-            ...(group && { group }),
-            order: [...getFinalOrder(order), ['createdAt', 'DESC']],
+            ...getIncludeAndWhere(model, include, { ...where, ...searchWhere, ...deletedAtWhere }),
+            ...(group && { group: group.map(pangea_helpers_1.camelToSnake) }),
+            order: [...getFinalOrder(order), ...(!group ? [['createdAt', 'DESC']] : [])],
             paranoid: paranoid === 'active',
             subQuery: false,
             transaction: this.__tx,
@@ -71,10 +67,7 @@ class Db {
                         limit: pageSize,
                     });
                     const ids = idRows.map((row) => row.id);
-                    return model.findAll({
-                        ...baseOptions,
-                        where: { id: { [_1.Ops.in]: ids } },
-                    });
+                    return model.findAll({ ...baseOptions, where: { id: { [_1.Ops.in]: ids } } });
                 })(),
                 model.count({ ...baseOptions, col: 'id', distinct: true }),
             ]);
@@ -92,11 +85,7 @@ class Db {
     }
     insertMany(model, data, options = {}) {
         return handleDbError(async () => {
-            const newInstances = await model.bulkCreate(data, {
-                ...options,
-                validate: true,
-                transaction: this.__tx,
-            });
+            const newInstances = await model.bulkCreate(data, { ...options, validate: true, transaction: this.__tx });
             return newInstances.length;
         });
     }
@@ -174,9 +163,12 @@ exports.Db = Db;
 function getFinalAttributes(attributes) {
     if (!attributes)
         return;
-    return attributes.map(([column, alias]) => {
+    return attributes.map((attribute) => {
+        if (typeof attribute === 'string')
+            return [(0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(attribute)), attribute];
+        const [alias, column] = Object.entries(attribute)[0];
         if (typeof column === 'string')
-            return [(0, sequelize_1.col)(column), alias];
+            return [(0, sequelize_1.col)((0, pangea_helpers_1.camelToSnake)(column)), alias];
         const [op, field] = column;
         return [(0, sequelize_1.fn)(op, (0, sequelize_1.col)(field)), alias];
     });

package/dist/database/seed.helpers.d.ts

@@ -1,4 +1,5 @@
 import type { Models, Seeds } from './database.types';
 export declare function dropTables(): Promise<void>;
+export declare function emptyTables(): Promise<void>;
 export declare function syncTables(): Promise<void>;
 export declare function seedTables<M extends Models>(models: M, seeds: Seeds<M>): Promise<void>;

package/dist/database/seed.helpers.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.seedTables = exports.syncTables = exports.dropTables = void 0;
+exports.seedTables = exports.syncTables = exports.emptyTables = exports.dropTables = void 0;
 const db_client_1 = require("./db-client");
 const db_class_1 = require("./db.class");
 // helpers
@@ -12,6 +12,13 @@ async function dropTables() {
     (0, helpers_1.printSuccess)('database', 'tables dropped');
 }
 exports.dropTables = dropTables;
+async function emptyTables() {
+    (0, helpers_1.printInfo)('database', 'emptying tables...');
+    const dbClient = (0, db_client_1.getDbClient)();
+    await dbClient.truncate({ truncate: true, cascade: true });
+    (0, helpers_1.printSuccess)('database', 'tables emptied');
+}
+exports.emptyTables = emptyTables;
 async function syncTables() {
     const dbClient = (0, db_client_1.getDbClient)();
     await dbClient.sync();
@@ -27,10 +34,7 @@ async function seedTables(models, seeds) {
     const db = new db_class_1.Db(tx);
     try {
         await db.disableForeignKeyChecks();
-        await Promise.all(modelsWithData.map(async (modelName) => {
-            const data = seeds[modelName];
-            await db.insertMany(models[modelName], data);
-        }));
+        await Promise.all(modelsWithData.map((modelName) => db.insertMany(models[modelName], seeds[modelName])));
         await db.enableForeignKeyChecks();
         await tx.commit();
     }

package/package.json

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