mythix 2.5.1 → 2.5.3

package/package.json

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

package/src/application.js

@@ -232,7 +232,10 @@ class Application extends EventEmitter {
     try {
       let appOptions = this.getOptions();
 
-      const config = require(configPath);
+      let config = require(configPath);
+      if (config.__esModule)
+        config = config['default'];
+
       return wrapConfig(Object.assign({}, config || {}, { environment: (appOptions.environment || config.environment || 'development')}));
     } catch (error) {
       this.getLogger().error(`Error while trying to load application configuration ${configPath}: `, error);

package/src/cli/cli-utils.js

@@ -5,7 +5,7 @@
 const Path        = require('path');
 const FileSystem  = require('fs');
 const Nife        = require('nife');
-const Logger      = require('../logger');
+const { Logger }  = require('../logger');
 
 const {
   walkDir,

package/src/cli/routes-command.js

@@ -1,7 +1,7 @@
 'use strict';
 
 const { defineCommand } = require('./cli-utils');
-const Logger            = require('../logger');
+const { Logger }        = require('../logger');
 const { buildRoutes }   = require('../controllers/controller-utils');
 
 const TAB_SIZE = 8;

package/src/controllers/controller-module.js

@@ -80,7 +80,7 @@ class ControllerModule extends BaseModule {
 
       try {
         let controllerGenerator = require(controllerFile);
-        if (controllerGenerator['default'] && typeof controllerGenerator['default'] === 'function')
+        if (controllerGenerator.__esModule)
           controllerGenerator = controllerGenerator['default'];
 
         Object.assign(controllers, controllerGenerator(args));

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

@@ -374,7 +374,7 @@ function generateRoutes(_routes, _options) {
     if (clientOptions == null) {
       var contentType = route.accept;
       if (Nife.isEmpty(contentType))
-        contentType = 'application/json; charset=UTF-8';
+        contentType = 'application/json';
       else if (Array.isArray(contentType))
         contentType = contentType[0];
 

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

@@ -434,7 +434,13 @@ class HTTPServer {
     app.use((request, response, next) => {
       if ((/application\/json/i).test(request.headers['content-type']) && Buffer.isBuffer(request.body)) {
         let bodyStr = request.body.toString('utf8');
-        request._rawBody = request.body = bodyStr;
+        request._rawBody = bodyStr;
+
+        try {
+          request.body = JSON.parse(bodyStr);
+        } catch (error) {
+          request.body = bodyStr;
+        }
       }
 
       next();

package/src/index.js

@@ -1,12 +1,12 @@
 'use strict';
 
 const { Application }   = require('./application');
+const { Logger }        = require('./logger');
 const ModelScope        = require('./models');
 const HTTPServerScope   = require('./http-server');
 const ControllerScope   = require('./controllers');
 const CLIUtilsScope     = require('./cli');
 const TasksScope        = require('./tasks');
-const Logger            = require('./logger');
 const Utils             = require('./utils');
 const Modules           = require('./modules');
 
@@ -14,6 +14,7 @@ module.exports = {
   defineCommand:          CLIUtilsScope.defineCommand,
   defineController:       ControllerScope.defineController,
   defineModel:            ModelScope.defineModel,
+  registerModel:          ModelScope.registerModel,
   defineTask:             TasksScope.defineTask,
 
   CLI:                    CLIUtilsScope,

package/src/models/model-module.js

@@ -86,7 +86,7 @@ class ModelModule extends BaseModule {
 
       try {
         let modelGenerator = require(modelFile);
-        if (modelGenerator['default'] && typeof modelGenerator['default'] === 'function')
+        if (modelGenerator.__esModule)
           modelGenerator = modelGenerator['default'];
 
         Object.assign(models, modelGenerator(args));

package/src/tasks/task-module.js

@@ -91,7 +91,7 @@ class TaskModule extends BaseModule {
 
       try {
         let taskGenerator = require(taskFile);
-        if (taskGenerator['default'] && typeof taskGenerator['default'] === 'function')
+        if (taskGenerator.__esModule)
           taskGenerator = taskGenerator['default'];
 
         Object.assign(tasks, taskGenerator(args));

package/src/utils/test-utils.js

@@ -4,8 +4,8 @@
 
 const Nife                  = require('nife');
 const { Utils }             = require('mythix-orm');
-const Logger                = require('../logger');
-const DatabaseModule        = require('../modules/database-module');
+const { Logger }            = require('../logger');
+const { DatabaseModule }    = require('../modules/database-module');
 const { HTTPInterface }     = require('./http-interface');
 const { HTTPServerModule }  = require('../http-server/http-server-module');