@loomcore/api 0.1.48 → 0.1.50

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

@@ -4,13 +4,13 @@ export declare class MigrationRunner {
     private dbUrl;
     private migrationsDir;
     private primaryTimezone;
-    private mongoClient;
+    private dbConnection;
     constructor(config: IBaseApiConfig);
     private getTimestamp;
     private parseSql;
     private getMigrator;
     private wipeDatabase;
-    run(command: 'up' | 'down' | 'reset'): Promise<void>;
+    run(command: 'up' | 'down' | 'reset', target?: string): Promise<void>;
     private closeConnection;
     create(name: string): Promise<void>;
 }

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

@@ -10,7 +10,7 @@ export class MigrationRunner {
     dbUrl;
     migrationsDir;
     primaryTimezone;
-    mongoClient = null;
+    dbConnection;
     constructor(config) {
         this.dbType = config.app.dbType || 'mongodb';
         this.dbUrl = this.dbType === 'postgres' ? buildPostgresUrl(config) : buildMongoUrl(config);
@@ -33,27 +33,41 @@ export class MigrationRunner {
         const getPart = (type) => parts.find(p => p.type === type)?.value || '00';
         return `${getPart('year')}${getPart('month')}${getPart('day')}${getPart('hour')}${getPart('minute')}${getPart('second')}`;
     }
-    parseSql(content) {
-        const upMatch = content.match(/--\s*up\s([\s\S]+?)(?=--\s*down|$)/i);
-        const downMatch = content.match(/--\s*down\s([\s\S]+)/i);
-        return {
-            up: upMatch ? upMatch[1].trim() : '',
-            down: downMatch ? downMatch[1].trim() : ''
-        };
+    parseSql(filename, content) {
+        const upMatch = content.match(/--\s*up\s+([\s\S]+?)(?=--\s*down|$)/i);
+        const downMatch = content.match(/--\s*down\s+([\s\S]+)/i);
+        const upSql = upMatch ? upMatch[1].trim() : '';
+        const downSql = downMatch ? downMatch[1].trim() : '';
+        if (!upSql && this.dbType === 'postgres') {
+            throw new Error(`❌ Parsing Error in ${filename}: Could not find '-- up' section or it was empty.`);
+        }
+        return { up: upSql, down: downSql };
     }
     async getMigrator() {
+        if (!fs.existsSync(this.migrationsDir)) {
+            throw new Error(`❌ Migrations directory not found at: ${this.migrationsDir}`);
+        }
         if (this.dbType === 'postgres') {
             const pool = new Pool({ connectionString: this.dbUrl });
+            this.dbConnection = pool;
+            const globPattern = path.join(this.migrationsDir, '*.sql').replace(/\\/g, '/');
+            console.log(`🔎 Looking for migrations in: ${globPattern}`);
             return new Umzug({
                 migrations: {
-                    glob: path.join(this.migrationsDir, '*.sql'),
+                    glob: globPattern,
                     resolve: ({ name, path: filePath, context }) => {
                         const content = fs.readFileSync(filePath, 'utf8');
-                        const { up, down } = this.parseSql(content);
+                        const { up, down } = this.parseSql(name, content);
                         return {
                             name,
-                            up: async () => context.query(up),
-                            down: async () => context.query(down)
+                            up: async () => {
+                                console.log(`   Running SQL for ${name}...`);
+                                await context.query(up);
+                            },
+                            down: async () => {
+                                console.log(`   Running Undo SQL for ${name}...`);
+                                await context.query(down);
+                            }
                         };
                     }
                 },
@@ -71,15 +85,17 @@ export class MigrationRunner {
                         await context.query(`DELETE FROM migrations WHERE name = $1`, [name]);
                     }
                 },
-                logger: console,
+                logger: undefined,
             });
         }
         else if (this.dbType === 'mongodb') {
             const client = await MongoClient.connect(this.dbUrl);
-            this.mongoClient = client;
+            this.dbConnection = client;
             const db = client.db();
+            const globPattern = path.join(this.migrationsDir, '*.ts').replace(/\\/g, '/');
+            console.log(`🔎 Looking for migrations in: ${globPattern}`);
             return new Umzug({
-                migrations: { glob: path.join(this.migrationsDir, '*.ts') },
+                migrations: { glob: globPattern },
                 context: db,
                 storage: new MongoDBStorage({ collection: db.collection('migrations') }),
                 logger: console,
@@ -105,42 +121,62 @@ export class MigrationRunner {
         }
         console.log('✅ Database wiped.');
     }
-    async run(command) {
+    async run(command, target) {
         try {
             if (command === 'reset') {
                 await this.wipeDatabase();
                 console.log('🚀 Restarting migrations...');
                 const migrator = await this.getMigrator();
-                await migrator.up();
-                await this.closeConnection(migrator);
+                await migrator.up(target ? { to: target } : undefined);
+                await this.closeConnection();
                 console.log('✅ Reset complete.');
                 return;
             }
             const migrator = await this.getMigrator();
+            migrator.on('migrating', ({ name }) => console.log(`🚀 Migrating: ${name}`));
+            migrator.on('migrated', ({ name }) => console.log(`✅ Completed: ${name}`));
+            const pending = await migrator.pending();
+            console.log(`ℹ️  Found ${pending.length} pending migrations.`);
+            if (pending.length === 0 && command === 'up') {
+                console.log('⚠️  No pending migrations. (Check the path/glob if this is unexpected)');
+            }
             switch (command) {
                 case 'up':
-                    await migrator.up();
-                    console.log('✅ Migrations up to date.');
+                    await migrator.up(target ? { to: target } : undefined);
+                    console.log(target ? `✅ Migrated up to ${target}` : '✅ Migrations up to date.');
                     break;
                 case 'down':
-                    await migrator.down();
-                    console.log('✅ Reverted last migration.');
+                    if (target) {
+                        await migrator.down({ to: target });
+                        console.log(`✅ Reverted down to ${target}`);
+                    }
+                    else {
+                        await migrator.down();
+                        console.log('✅ Reverted last migration.');
+                    }
                     break;
             }
-            await this.closeConnection(migrator);
+            await this.closeConnection();
         }
         catch (err) {
             console.error('❌ Migration failed:', err);
+            await this.closeConnection();
             process.exit(1);
         }
     }
-    async closeConnection(migrator) {
-        if (this.dbType === 'postgres') {
-            await migrator.context.end();
+    async closeConnection() {
+        if (!this.dbConnection)
+            return;
+        try {
+            if (this.dbType === 'postgres') {
+                await this.dbConnection.end();
+            }
+            else if (this.dbType === 'mongo') {
+                await this.dbConnection.close();
+            }
         }
-        else if (this.dbType === 'mongodb' && this.mongoClient) {
-            await this.mongoClient.close();
-            this.mongoClient = null;
+        catch (e) {
+            console.warn('Warning: Error closing connection', e);
         }
     }
     async create(name) {

package/package.json

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