mythix 2.4.10 → 2.4.13

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "2.4.10",
+  "version": "2.4.13",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index.js",
   "scripts": {
@@ -30,7 +30,7 @@
     "express": "^4.17.3",
     "express-busboy": "github:th317erd/express-busboy#0754a570d7979097b31e48655b80d3fcd628d4e4",
     "form-data": "^4.0.0",
-    "mythix-orm": "^1.5.2",
+    "mythix-orm": "^1.5.6",
     "nife": "^1.11.3",
     "prompts": "^2.4.2"
   }

package/src/cli/cli-utils.js

@@ -308,7 +308,7 @@ function loadMythixConfig(_mythixConfigPath, _appRootPath) {
 
   let defaultConfig = {
     runtime:              process.env.MYTHIX_RUNTIME || 'node',
-    runtimeArgs:          (process.env.MYTHIX_RUNTIME_ARGS || '').split(/\s+/g),
+    runtimeArgs:          (process.env.MYTHIX_RUNTIME_ARGS || '').split(/\s+/g).filter(Boolean),
     applicationPath:      (config) => Path.resolve(config.appRootPath, 'application.js'),
     getApplicationClass:  (config) => {
       let Application = require(config.applicationPath);
@@ -347,7 +347,7 @@ function spawnCommand(args, options, _config) {
     try {
       let childProcess = spawn(
         config.runtime || 'node',
-        (config.runtimeArgs || []).concat(args),
+        (config.runtimeArgs || []).concat(args).filter(Boolean),
         Object.assign({}, options || {}, {
           env:    Object.assign({}, process.env, (options || {}).env || {}),
           stdio:  'inherit',

package/src/controllers/generate-client-api-interface.js

@@ -87,7 +87,7 @@ function nodeRequestHandler(routeName, requestOptions) {
         headers: Utils.cleanObjectProperties(Object.assign(
           {},
           headers,
-          Utils.keysToLowerCase(extraConfig.headers || {})
+          Utils.keysToLowerCase(extraConfig.headers || {}),
         )),
       },
     );
@@ -203,7 +203,7 @@ function browserRequestHandler(routeName, requestOptions) {
         headers: Utils.cleanObjectProperties(Object.assign(
           {},
           headers,
-          Utils.keysToLowerCase(extraConfig.headers || {})
+          Utils.keysToLowerCase(extraConfig.headers || {}),
         )),
       },
     );

package/src/models/model-module.js

@@ -114,7 +114,7 @@ class ModelModule extends BaseModule {
     let application = this.getApplication();
     let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
     if (!connection)
-      return;
+      return {};
 
     return connection.getModels();
   }

package/src/tasks/task-base.js

@@ -55,17 +55,17 @@ class TaskBase {
   }
 
   getModel(name) {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getModel(name);
   }
 
   getModels() {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getModels();
   }
 
   getDBConnection() {
-    let application = this.application;
+    let application = this.getApplication();
     return application.getDBConnection();
   }
 

package/src/tasks/task-module.js

@@ -84,7 +84,7 @@ class TaskModule extends BaseModule {
     let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
     let dbConfig    = (typeof application.getDBConfig === 'function') ? application.getDBConfig() : null;
     let tasks       = {};
-    let args        = { application: this, connection, dbConfig };
+    let args        = { application, connection, dbConfig };
 
     for (let i = 0, il = taskFiles.length; i < il; i++) {
       let taskFile = taskFiles[i];
@@ -160,7 +160,7 @@ class TaskModule extends BaseModule {
       try {
         if (!TaskKlass.keepAlive || !taskInstance) {
           logger        = createTaskLogger();
-          taskInstance  = new TaskKlass(this, logger, runID, { lastTime, currentTime, diff });
+          taskInstance  = new TaskKlass(this.getApplication(), logger, runID, { lastTime, currentTime, diff });
 
           taskInfo.taskInstance = taskInstance;