mythix 4.0.1 → 4.0.2

package/LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2022 Wyatt Greenway
+Copyright (c) 2023 Wyatt Greenway
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

package/lib/cli/cli-utils.mjs

@@ -97,8 +97,8 @@ export async function executeCommandByName(commandName) {
     if (Nife.isEmpty(mythixConfigPath))
       mythixConfigPath = PWD;
 
-    let config      = await loadMythixConfig(mythixConfigPath);
-    let Application = await config.getApplicationClass(config);
+    let cliConfig   = await loadMythixConfig(mythixConfigPath);
+    let Application = await cliConfig.getApplicationClass(cliConfig);
     let Commands    = Application.getCommandList();
 
     CommandClass = Commands[commandName];
@@ -109,7 +109,7 @@ export async function executeCommandByName(commandName) {
 
     let applicationConfig = CommandClass.applicationConfig;
     if (typeof applicationConfig === 'function')
-      applicationConfig = applicationConfig(config, Application);
+      applicationConfig = applicationConfig(cliConfig, Application);
     else if (applicationConfig)
       applicationConfig = Nife.extend(true, { cli: true, httpServer: false, autoReload: false, logger: { level: Logger.LEVEL_WARN }, runTasks: false }, applicationConfig);
 
@@ -132,6 +132,7 @@ export async function executeCommandByName(commandName) {
       await application.start();
 
     commandContext = await getArgumentsContext(application);
+    commandContext.cliConfig = cliConfig;
 
     let commandOptions  = commandContext[commandName] || {};
     let commandInstance = new CommandClass(application, commandOptions);

package/lib/cli/command-base.mjs

@@ -22,6 +22,10 @@ export class CommandBase {
     });
   }
 
+  getCLIConfig() {
+    return this.options.cliConfig || {};
+  }
+
   getOptions() {
     return this.options;
   }

package/lib/cli/commands/migrate-command.mjs

@@ -38,7 +38,7 @@ export class MigrateCommand extends CommandBase {
           if (fileName.match(/^_/) && stats.isDirectory())
             return false;
 
-          if (stats.isFile() && !fileName.match(/^\d{14}.*\.js$/))
+          if (stats.isFile() && !fileName.match(/^\d{14}.*\.[mc]?js$/))
             return false;
 
           return true;
@@ -76,7 +76,10 @@ export class MigrateCommand extends CommandBase {
   }
 
   async executeMigration(application, dbConnection, migrationFileName, useTransaction, rollback) {
-    let migration = require(migrationFileName);
+    let migration = await import(migrationFileName);
+    if (migration && migration.default)
+      migration = migration.default;
+
     let startTime = Nife.now();
 
     if (rollback) {
@@ -146,14 +149,14 @@ export class MigrateCommand extends CommandBase {
       );
     };
 
-    let application         = this.getApplication();
-    let applicationOptions  = application.getOptions();
-    let dbConnection        = application.getConnection();
-    let migrationsPath      = applicationOptions.migrationsPath;
-    let migrationFiles      = this.getMigrationFiles(migrationsPath);
-    let useTransaction      = args.transaction;
-    let rollback            = args.rollback;
-    let migrationID         = args.revision;
+    let cliConfig       = this.getCLIConfig();
+    let application     = this.getApplication();
+    let dbConnection    = application.getConnection();
+    let migrationsPath  = cliConfig.migrationRoot || Path.resolve(cliConfig.appRootPath, 'migrations');
+    let migrationFiles  = this.getMigrationFiles(migrationsPath);
+    let useTransaction  = args.transaction;
+    let rollback        = args.rollback;
+    let migrationID     = args.revision;
 
     if (!migrationID)
       migrationID = await this.fetchLastMigrationIDFromDB(dbConnection);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "lib/index.mjs",
   "type": "module",