@loomcore/api 0.1.42 → 0.1.46

package/dist/databases/db-type.type.d.ts

@@ -0,0 +1 @@
+export type DbType = 'postgres' | 'mongodb';

package/dist/databases/db-type.type.js

@@ -0,0 +1 @@
+export {};

package/dist/databases/index.d.ts

@@ -1,5 +1,6 @@
-export * from './mongo-db/index.js';
-export * from './postgres/index.js';
+export * from './db-type.type.js';
+export * from './migrations/migration-runner.js';
 export * from './models/index.js';
+export * from './mongo-db/index.js';
 export * from './operations/index.js';
-export * from './migrations/migration-runner.js';
+export * from './postgres/index.js';

package/dist/databases/index.js

@@ -1,5 +1,6 @@
-export * from './mongo-db/index.js';
-export * from './postgres/index.js';
+export * from './db-type.type.js';
+export * from './migrations/migration-runner.js';
 export * from './models/index.js';
+export * from './mongo-db/index.js';
 export * from './operations/index.js';
-export * from './migrations/migration-runner.js';
+export * from './postgres/index.js';

package/dist/databases/migrations/migration-runner.d.ts

@@ -1,16 +1,14 @@
-export type DbType = 'postgres' | 'mongo';
-export interface MigrationConfig {
-    dbType: DbType;
-    dbUrl: string;
-    migrationsDir: string;
-}
+import { IBaseApiConfig } from '../../models/base-api-config.interface.js';
 export declare class MigrationRunner {
-    private config;
+    private dbType;
+    private dbUrl;
+    private migrationsDir;
     private mongoClient;
-    constructor(config: MigrationConfig);
+    constructor(config: IBaseApiConfig);
     private parseSql;
     private getMigrator;
     private wipeDatabase;
     run(command: 'up' | 'down' | 'reset'): Promise<void>;
     private closeConnection;
+    create(name: string): Promise<void>;
 }

package/dist/databases/migrations/migration-runner.js

@@ -3,11 +3,21 @@ import { Pool } from 'pg';
 import { MongoClient } from 'mongodb';
 import fs from 'fs';
 import path from 'path';
+import { buildMongoUrl } from '../mongo-db/utils/build-mongo-url.util.js';
+import { buildPostgresUrl } from '../postgres/utils/build-postgres-url.util.js';
+const getTimestamp = () => {
+    const now = new Date();
+    return now.toISOString().replace(/[-T:.Z]/g, '').slice(0, 14);
+};
 export class MigrationRunner {
-    config;
+    dbType;
+    dbUrl;
+    migrationsDir;
     mongoClient = null;
     constructor(config) {
-        this.config = config;
+        this.dbType = config.app.dbType || 'mongodb';
+        this.dbUrl = this.dbType === 'postgres' ? buildPostgresUrl(config) : buildMongoUrl(config);
+        this.migrationsDir = path.join(process.cwd(), 'database', 'migrations');
     }
     parseSql(content) {
         const upMatch = content.match(/--\s*up\s([\s\S]+?)(?=--\s*down|$)/i);
@@ -18,12 +28,11 @@ export class MigrationRunner {
         };
     }
     async getMigrator() {
-        const { dbType, dbUrl, migrationsDir } = this.config;
-        if (dbType === 'postgres') {
-            const pool = new Pool({ connectionString: dbUrl });
+        if (this.dbType === 'postgres') {
+            const pool = new Pool({ connectionString: this.dbUrl });
             return new Umzug({
                 migrations: {
-                    glob: path.join(migrationsDir, '*.sql'),
+                    glob: path.join(this.migrationsDir, '*.sql'),
                     resolve: ({ name, path: filePath, context }) => {
                         const content = fs.readFileSync(filePath, 'utf8');
                         const { up, down } = this.parseSql(content);
@@ -51,24 +60,23 @@ export class MigrationRunner {
                 logger: console,
             });
         }
-        else if (dbType === 'mongo') {
-            const client = await MongoClient.connect(dbUrl);
+        else if (this.dbType === 'mongodb') {
+            const client = await MongoClient.connect(this.dbUrl);
             this.mongoClient = client;
             const db = client.db();
             return new Umzug({
-                migrations: { glob: path.join(migrationsDir, '*.ts') },
+                migrations: { glob: path.join(this.migrationsDir, '*.ts') },
                 context: db,
                 storage: new MongoDBStorage({ collection: db.collection('migrations') }),
                 logger: console,
             });
         }
-        throw new Error(`Unsupported DB_TYPE: ${dbType}`);
+        throw new Error(`Unsupported DB_TYPE: ${this.dbType}`);
     }
     async wipeDatabase() {
-        const { dbType, dbUrl } = this.config;
-        console.log(`⚠️  Wiping ${dbType} database...`);
-        if (dbType === 'postgres') {
-            const pool = new Pool({ connectionString: dbUrl });
+        console.log(`⚠️  Wiping ${this.dbType} database...`);
+        if (this.dbType === 'postgres') {
+            const pool = new Pool({ connectionString: this.dbUrl });
             try {
                 await pool.query('DROP SCHEMA public CASCADE; CREATE SCHEMA public;');
             }
@@ -76,8 +84,8 @@ export class MigrationRunner {
                 await pool.end();
             }
         }
-        else if (dbType === 'mongo') {
-            const client = await MongoClient.connect(dbUrl);
+        else if (this.dbType === 'mongodb') {
+            const client = await MongoClient.connect(this.dbUrl);
             await client.db().dropDatabase();
             await client.close();
         }
@@ -113,12 +121,56 @@ export class MigrationRunner {
         }
     }
     async closeConnection(migrator) {
-        if (this.config.dbType === 'postgres') {
+        if (this.dbType === 'postgres') {
             await migrator.context.end();
         }
-        else if (this.config.dbType === 'mongo' && this.mongoClient) {
+        else if (this.dbType === 'mongodb' && this.mongoClient) {
             await this.mongoClient.close();
             this.mongoClient = null;
         }
     }
+    async create(name) {
+        if (!name) {
+            throw new Error('Migration name is required');
+        }
+        const safeName = name.toLowerCase().replace(/[^a-z0-9]+/g, '_');
+        const filename = `${getTimestamp()}_${safeName}`;
+        let extension = '';
+        let content = '';
+        if (this.dbType === 'postgres') {
+            extension = 'sql';
+            content = `-- Migration: ${safeName}
+-- Created: ${new Date().toISOString()}
+
+-- up
+-- Write your CREATE/ALTER statements here...
+
+
+-- down
+-- Write your DROP/UNDO statements here...
+`;
+        }
+        else {
+            extension = 'ts';
+            content = `import { Db } from 'mongodb';
+
+// Migration: ${safeName}
+// Created: ${new Date().toISOString()}
+
+export const up = async ({ context: db }: { context: Db }) => {
+  // await db.collection('...')....
+};
+
+export const down = async ({ context: db }: { context: Db }) => {
+  // await db.collection('...')....
+};
+`;
+        }
+        const fullPath = path.join(this.migrationsDir, `${filename}.${extension}`);
+        if (!fs.existsSync(this.migrationsDir)) {
+            fs.mkdirSync(this.migrationsDir, { recursive: true });
+        }
+        fs.writeFileSync(fullPath, content);
+        console.log(`✅ Created migration:\n   ${fullPath}`);
+    }
 }

package/dist/databases/mongo-db/utils/build-mongo-url.util.d.ts

@@ -0,0 +1,2 @@
+import { IBaseApiConfig } from "../../../models/base-api-config.interface.js";
+export declare function buildMongoUrl(config: IBaseApiConfig): string;

package/dist/databases/mongo-db/utils/build-mongo-url.util.js

@@ -0,0 +1,13 @@
+export function buildMongoUrl(config) {
+    const { database } = config;
+    if (!database) {
+        throw new Error("Database configuration is required to build the MongoDB URL.");
+    }
+    const { user, password, host, port, name } = database;
+    if (!user || !password || !host || !port || !name) {
+        throw new Error("Database configuration must include user, password, host, port, and name to build the MongoDB URL.");
+    }
+    const encodedUser = encodeURIComponent(user);
+    const encodedPassword = encodeURIComponent(password);
+    return `mongodb://${encodedUser}:${encodedPassword}@${host}:${port}/${name}`;
+}

package/dist/databases/mongo-db/utils/index.d.ts

@@ -1,4 +1,5 @@
 export * from './build-find-options.util.js';
+export * from './build-mongo-url.util.js';
 export * from './build-no-sql-match.util.js';
 export * from './convert-object-ids-to-strings.util.js';
 export * from './convert-operations-to-pipeline.util.js';

package/dist/databases/mongo-db/utils/index.js

@@ -1,4 +1,5 @@
 export * from './build-find-options.util.js';
+export * from './build-mongo-url.util.js';
 export * from './build-no-sql-match.util.js';
 export * from './convert-object-ids-to-strings.util.js';
 export * from './convert-operations-to-pipeline.util.js';

package/dist/databases/postgres/utils/build-postgres-url.util.d.ts

@@ -0,0 +1,2 @@
+import { IBaseApiConfig } from "../../../models/base-api-config.interface.js";
+export declare function buildPostgresUrl(config: IBaseApiConfig): string;

package/dist/databases/postgres/utils/build-postgres-url.util.js

@@ -0,0 +1,13 @@
+export function buildPostgresUrl(config) {
+    const { database } = config;
+    if (!database) {
+        throw new Error("Database configuration is required to build the PostgreSQL URL.");
+    }
+    const { user, password, host, port, name } = database;
+    if (!user || !password || !host || !port || !name) {
+        throw new Error("Database configuration must include user, password, host, port, and name to build the PostgreSQL URL.");
+    }
+    const encodedUser = encodeURIComponent(user);
+    const encodedPassword = encodeURIComponent(password);
+    return `postgresql://${encodedUser}:${encodedPassword}@${host}:${port}/${name}`;
+}

package/dist/databases/postgres/utils/index.d.ts

@@ -1 +1,2 @@
+export * from './build-postgres-url.util.js';
 export * from './does-table-exist.util.js';

package/dist/databases/postgres/utils/index.js

@@ -1 +1,2 @@
+export * from './build-postgres-url.util.js';
 export * from './does-table-exist.util.js';

package/dist/middleware/index.d.ts

@@ -1,3 +1,4 @@
 export * from './error-handler.js';
 export * from './is-authorized.js';
 export * from './ensure-user-context.js';
+export * from './request-lifecycle.js';

package/dist/middleware/index.js

@@ -1,3 +1,4 @@
 export * from './error-handler.js';
 export * from './is-authorized.js';
 export * from './ensure-user-context.js';
+export * from './request-lifecycle.js';

package/dist/middleware/request-lifecycle.d.ts

@@ -0,0 +1,6 @@
+import { Request, Response, NextFunction } from 'express';
+export interface RequestLifecycleOptions {
+    onRequestStart?: (req: Request, res: Response) => void | Promise<void>;
+    onRequestEnd?: (req: Request, res: Response, error?: Error) => void | Promise<void>;
+}
+export declare const requestLifecycle: (options?: RequestLifecycleOptions) => (req: Request, res: Response, next: NextFunction) => Promise<void>;

package/dist/middleware/request-lifecycle.js

@@ -0,0 +1,45 @@
+export const requestLifecycle = (options = {}) => {
+    const { onRequestStart, onRequestEnd } = options;
+    return async (req, res, next) => {
+        req.startTime = Date.now();
+        if (onRequestStart) {
+            try {
+                await onRequestStart(req, res);
+            }
+            catch (error) {
+                console.error('Error in onRequestStart callback:', error);
+            }
+        }
+        let endCallbackCalled = false;
+        const callOnRequestEnd = async (error) => {
+            if (endCallbackCalled)
+                return;
+            endCallbackCalled = true;
+            if (onRequestEnd) {
+                try {
+                    await onRequestEnd(req, res, error);
+                }
+                catch (callbackError) {
+                    console.error('Error in onRequestEnd callback:', callbackError);
+                }
+            }
+        };
+        res.on('finish', () => {
+            const error = req.lifecycleError;
+            callOnRequestEnd(error);
+        });
+        res.on('close', () => {
+            if (!res.writableEnded && !endCallbackCalled) {
+                const error = req.lifecycleError || new Error('Request closed before completion');
+                callOnRequestEnd(error);
+            }
+        });
+        try {
+            await next();
+        }
+        catch (error) {
+            req.lifecycleError = error instanceof Error ? error : new Error(String(error));
+            throw error;
+        }
+    };
+};

package/dist/models/base-api-config.interface.d.ts

@@ -1,3 +1,4 @@
+import { DbType } from "../databases/db-type.type.js";
 export interface IBaseApiConfig {
     appName: string;
     env: string;
@@ -5,6 +6,10 @@ export interface IBaseApiConfig {
     clientSecret: string;
     database: {
         name?: string;
+        host?: string;
+        port?: number;
+        user?: string;
+        password?: string;
     };
     externalPort?: number;
     internalPort?: number;
@@ -19,6 +24,7 @@ export interface IBaseApiConfig {
         isMultiTenant: boolean;
         metaOrgName?: string;
         metaOrgCode?: string;
+        dbType?: DbType;
     };
     adminUser?: {
         email: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.42",
+  "version": "0.1.46",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {