mythix 2.7.3 → 2.8.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.7.3",
+  "version": "2.8.0",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index",
   "scripts": {

package/src/application.d.ts

@@ -8,6 +8,7 @@ import { Modules, ModuleClasses, BaseModuleClass } from './modules/base-module';
 export declare type ApplicationClass = typeof Application;
 
 export declare interface ApplicationOptions {
+  cli: boolean;
   environment: string;
   appName: string;
   rootPath: string;
@@ -29,7 +30,7 @@ export declare interface ApplicationOptions {
   database: boolean | GenericObject;
   httpServer: boolean | GenericObject;
   tempPath: string;
-  routeParserTypes: { [ key: string ]: (value: string, param: GenericObject, index?: number) => any };
+  routeParserTypes: { [key: string]: (value: string, param: GenericObject, index?: number) => any };
 }
 
 export declare class Application {
@@ -54,7 +55,7 @@ export declare class Application {
   public setConfig(options: GenericObject): Application;
   public getApplicationName(): string;
   public getRoutes(): GenericObject;
-  public getCustomRouteParserTypes(): { [ key: string ]: (value: string, param: GenericObject, index?: number) => any };
+  public getCustomRouteParserTypes(): { [key: string]: (value: string, param: GenericObject, index?: number) => any };
   public createLogger(loggerOptions: LoggerOptions, LoggerClass: LoggerClass): Logger;
   public getLogger(): Logger;
   public start(): Promise<void>;

package/src/application.js

@@ -81,7 +81,6 @@ class Application extends EventEmitter {
       templatesPath:            Path.resolve(ROOT_PATH, 'templates'),
       commandsPath:             Path.resolve(ROOT_PATH, 'commands'),
       tasksPath:                Path.resolve(ROOT_PATH, 'tasks'),
-      modules:                  this.constructor.getDefaultModules(),
       autoReload:               ((_opts && _opts.environment) || process.env.NODE_ENV || 'development') === 'development',
       exitOnShutdown:           null,
       runTasks:                 true,
@@ -149,6 +148,8 @@ class Application extends EventEmitter {
 
     if (Nife.isEmpty(opts.tempPath))
       opts.tempPath = Path.resolve(OS.tmpdir(), this.getApplicationName().replace(/[^\w-]/g, ''), ('' + process.pid));
+
+    opts.modules = this.constructor.getDefaultModules(this, opts);
   }
 
   getApplicationName() {
@@ -176,7 +177,7 @@ class Application extends EventEmitter {
 
     for (let i = 0, il = modules.length; i < il; i++) {
       let ModuleClass = modules[i];
-      if (typeof ModuleClass.shouldUse === 'function' && ModuleClass.shouldUse.call(this, options) === false)
+      if (typeof ModuleClass.shouldUse === 'function' && ModuleClass.shouldUse.call(ModuleClass, this, options) === false)
         continue;
 
       let moduleInstance = new ModuleClass(this);

package/src/cli/cli-utils.js

@@ -250,10 +250,10 @@ function defineCommand(_commandName, definer, _parent) {
       if (typeof applicationConfig === 'function')
         applicationConfig = applicationConfig(config, Application);
       else if (applicationConfig)
-        applicationConfig = Nife.extend(true, { httpServer: false, autoReload: false, logger: { level: Logger.LEVEL_WARN }, runTasks: false }, applicationConfig);
+        applicationConfig = Nife.extend(true, { cli: true, httpServer: false, autoReload: false, logger: { level: Logger.LEVEL_WARN }, runTasks: false }, applicationConfig);
 
       if (!applicationConfig)
-        applicationConfig = { httpServer: false, autoReload: false, logger: { level: Logger.LEVEL_WARN }, runTasks: false };
+        applicationConfig = { cli: true, ttpServer: false, autoReload: false, logger: { level: Logger.LEVEL_WARN }, runTasks: false };
 
       let doStartApplication = (applicationConfig.autoStart !== false);
 

package/src/controllers/controller-module.js

@@ -11,7 +11,7 @@ const {
 class ControllerModule extends BaseModule {
   static fileWatcherQueueName = 'controllers';
 
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.httpServer === false)
       return false;
 

package/src/http-server/http-server-module.js

@@ -5,7 +5,7 @@ const { BaseModule }  = require('../modules/base-module');
 const { HTTPServer }  = require('./http-server');
 
 class HTTPServerModule extends BaseModule {
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.httpServer === false)
       return false;
 

package/src/models/model-module.js

@@ -16,7 +16,7 @@ class ModelModule extends BaseModule {
     return 'ModelModule';
   }
 
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.database === false)
       return false;
 

package/src/modules/base-module.d.ts

@@ -11,7 +11,7 @@ export declare class BaseModule {
   public declare static fileWatcherQueueName: string;
 
   public static getModuleName(): string;
-  public static shouldUse(options?: GenericObject): boolean;
+  public static shouldUse(application: Application, options: GenericObject): boolean;
 
   public fileWatcherGetMonitorPaths(options?: GenericObject): Array<string>;
   public fileWatcherHandler(options?: GenericObject): Promise<void>;

package/src/modules/database-module.js

@@ -9,7 +9,7 @@ class DatabaseModule extends BaseModule {
     return 'DatabaseModule';
   }
 
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.database === false)
       return false;
 

package/src/modules/file-watcher-module.js

@@ -9,7 +9,7 @@ class FileWatcherModule extends BaseModule {
     return 'FileWatcherModule';
   }
 
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.autoReload === false)
       return false;
 

package/src/tasks/task-module.js

@@ -23,7 +23,7 @@ class TaskModule extends BaseModule {
 
   static fileWatcherQueueName = 'tasks';
 
-  static shouldUse(options) {
+  static shouldUse(application, options) {
     if (options.runTasks === false)
       return false;