mythix 1.2.0 → 2.0.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mythix",
-  "version": "1.2.0",
+  "version": "2.0.2",
   "description": "Mythix is a NodeJS web-app framework",
   "main": "src/index.js",
   "scripts": {
@@ -19,26 +19,19 @@
   },
   "homepage": "https://github.com/th317erd/mythix#readme",
   "devDependencies": {
+    "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
     "colors": "^1.4.0",
     "diff": "^5.1.0",
+    "eslint": "^8.13.0",
     "jasmine": "^4.0.2"
   },
   "dependencies": {
-    "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
     "chokidar": "^3.5.3",
-    "deep-diff": "^1.0.2",
-    "eslint": "^8.13.0",
     "express": "^4.17.3",
     "express-busboy": "^8.0.2",
     "form-data": "^4.0.0",
-    "inflection": "^1.13.2",
-    "lodash": "^4.17.21",
-    "nife": "^1.8.1",
-    "object-hash": "^3.0.0",
-    "pg": "^8.7.3",
-    "pg-hstore": "^2.3.4",
-    "prompts": "^2.4.2",
-    "sequelize": "^6.18.0",
-    "sqlite3": "^5.0.9"
+    "mythix-orm": "^1.0.4",
+    "nife": "^1.11.3",
+    "prompts": "^2.4.2"
   }
 }

package/src/application.js

@@ -70,6 +70,7 @@ class Application extends EventEmitter {
     let ROOT_PATH = (_opts && _opts.rootPath) ? _opts.rootPath : Path.resolve(__dirname);
 
     let opts = Nife.extend(true, {
+      environment:              (process.env.NODE_ENV || 'development'),
       appName:                  this.constructor.APP_NAME,
       rootPath:                 ROOT_PATH,
       configPath:               Path.resolve(ROOT_PATH, 'config'),
@@ -81,7 +82,7 @@ class Application extends EventEmitter {
       commandsPath:             Path.resolve(ROOT_PATH, 'commands'),
       tasksPath:                Path.resolve(ROOT_PATH, 'tasks'),
       modules:                  this.constructor.getDefaultModules(),
-      autoReload:               (process.env.NODE_ENV || 'development') === 'development',
+      autoReload:               ((_opts && _opts.environment) || process.env.NODE_ENV || 'development') === 'development',
       exitOnShutdown:           null,
       runTasks:                 true,
       testMode:                 false,
@@ -229,8 +230,10 @@ class Application extends EventEmitter {
 
   loadConfig(configPath) {
     try {
+      let appOptions = this.getOptions();
+
       const config = require(configPath);
-      return wrapConfig(config);
+      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);
       throw error;

package/src/cli/migrations/makemigrations-command.js

@@ -138,7 +138,7 @@ module.exports = defineCommand('makemigrations', ({ Parent }) => {
 
       // Now build all model information
       connection.modelManager.forEachModel((Model) => {
-        let modelName = Model.customName || Model.name;
+        let modelName = Model.getModelName();
         let tableName = Model.getTableName(options);
 
         models.push({
@@ -799,7 +799,6 @@ module.exports = defineCommand('makemigrations', ({ Parent }) => {
 
           let oldAssertTableHasColumn = queryInterface.assertTableHasColumn;
           try {
-            // Tell Sequelize to shut up
             queryInterface.assertTableHasColumn = async () => ({ [oldColumnName]: columnDefinition });
 
             return await queryInterface.renameColumn(tableName, oldColumnName, newColumnName, options);

package/src/cli/migrations/migrate-command.js

@@ -61,18 +61,18 @@ module.exports = defineCommand('migrate', ({ Parent }) => {
       return migrationFiles.slice((isRollback) ? index : index + 1);
     }
 
-    async executeMigration(dbConnection, migrationFileName, useTransaction, rollback) {
+    async executeMigration(application, dbConnection, migrationFileName, useTransaction, rollback) {
       let migration = require(migrationFileName);
       let startTime = Nife.now();
 
       if (rollback) {
-        await migration.down(dbConnection);
+        await migration.down(dbConnection, application);
         await this.removeMigrationFromDB(migration.MIGRATION_ID);
 
         let seconds = ((Nife.now() - startTime) / MILLISECONDS_PER_SECOND).toFixed(2);
         console.log(`Rolled back migration ${migrationFileName} successfully in ${seconds} seconds`);
       } else {
-        await migration.up(dbConnection);
+        await migration.up(dbConnection, application);
         await this.storeSuccessfulMigrationToDB(migration.MIGRATION_ID);
 
         let seconds = ((Nife.now() - startTime) / MILLISECONDS_PER_SECOND).toFixed(2);
@@ -130,7 +130,7 @@ module.exports = defineCommand('migrate', ({ Parent }) => {
         else
           console.log(`Running migration ${migrationFileName}...`);
 
-        this.executeMigration(dbConnection, migrationFileName, useTransaction, rollback).then(
+        this.executeMigration(application, dbConnection, migrationFileName, useTransaction, rollback).then(
           () => nextMigration(doneCallback, index + 1),
           (error) => {
             console.error(`Error while running migration ${migrationFileName}: `, error);

package/src/cli/shell-command.js

@@ -5,7 +5,6 @@ const OS                = require('os');
 const Path              = require('path');
 const REPL              = require('repl');
 const UUIDV4            = require('uuid').v4;
-const { Sequelize }     = require('sequelize');
 const { defineCommand } = require('./cli-utils');
 const {
   HTTPInterface,
@@ -55,7 +54,6 @@ module.exports = defineCommand('shell', ({ Parent }) => {
         interactiveShell.setupHistory(Path.join(OS.homedir(), `.${appName}-${environment}-history`), () => {});
 
         interactiveShell.context.UUIDV4 = UUIDV4;
-        interactiveShell.context.Sequelize = Sequelize;
         interactiveShell.context.connection = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
         interactiveShell.context.application = application;
         interactiveShell.context.Nife = Nife;

package/src/controllers/controller-module.js

@@ -90,15 +90,6 @@ class ControllerModule extends BaseModule {
       }
     }
 
-    Object.defineProperties(controllers, {
-      '_files': {
-        writable:     true,
-        enumberable:  false,
-        configurable: true,
-        value:        controllerFiles,
-      },
-    });
-
     return controllers;
   }
 

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

@@ -2,7 +2,6 @@
 
 /* global process */
 
-const OS            = require('os');
 const Path          = require('path');
 const FileSystem    = require('fs');
 const HTTP          = require('http');
@@ -10,7 +9,6 @@ const HTTPS         = require('https');
 const Nife          = require('nife');
 const Express       = require('express');
 const ExpressBusBoy = require('express-busboy');
-const Sequelize     = require('sequelize');
 
 const {
   HTTPBaseError,
@@ -132,9 +130,6 @@ class HTTPServer {
       if (!logger)
         logger = request.mythixLogger = this.createRequestLogger(application, request);
 
-      if (!request.Sequelize)
-        request.Sequelize = Sequelize;
-
       request.route = route;
       request.params = params;
 

package/src/models/index.js

@@ -5,14 +5,10 @@ const { ModelModule } = require('./model-module');
 
 const {
   defineModel,
-  getModelPrimaryKeyField,
-  buildModelRelations,
 } = require('./model-utils');
 
 module.exports = {
-  buildModelRelations,
   defineModel,
-  getModelPrimaryKeyField,
   Model,
   ModelModule,
 };

package/src/models/migration-model.js

@@ -4,11 +4,11 @@ const { defineModel } = require('./model-utils');
 
 const ID_STRING_MAX_SIZE = 15;
 
-module.exports = defineModel('Migration', ({ Parent, Type }) => {
+module.exports = defineModel('Migration', ({ Parent, Types }) => {
   return class Migration extends Parent {
     static fields = {
       id: {
-        type:         Type.STRING(ID_STRING_MAX_SIZE),
+        type:         Types.STRING(ID_STRING_MAX_SIZE),
         allowNull:    false,
         primaryKey:   true,
         index:        true,

package/src/models/model-module.js

@@ -2,10 +2,8 @@
 
 /* global __dirname */
 
-const Path                    = require('path');
-const { Sequelize }           = require('sequelize');
-const { BaseModule }          = require('../modules/base-module');
-const { buildModelRelations } = require('./model-utils');
+const Path            = require('path');
+const { BaseModule }  = require('../modules/base-module');
 const {
   fileNameWithoutExtension,
   walkDir,
@@ -28,15 +26,6 @@ class ModelModule extends BaseModule {
   constructor(application) {
     super(application);
 
-    Object.defineProperties(this, {
-      'models': {
-        writable:     true,
-        enumerable:   false,
-        configurable: true,
-        value:        {},
-      },
-    });
-
     // Inject methods into the application
     Object.defineProperties(application, {
       'getModel': {
@@ -59,8 +48,7 @@ class ModelModule extends BaseModule {
   }
 
   async fileWatcherHandler(options) {
-    let models = await this.loadModels(options.modelsPath);
-    this.models = models;
+    await this.loadModels(options.modelsPath);
   }
 
   getModelFilePaths(modelsPath) {
@@ -91,7 +79,7 @@ class ModelModule extends BaseModule {
     let dbConfig    = (typeof application.getDBConfig === 'function') ? application.getDBConfig() : null;
     let modelFiles  = this.getModelFilePaths(modelsPath);
     let models      = {};
-    let args        = { application, Sequelize, connection, dbConfig };
+    let args        = { application, connection, dbConfig };
 
     for (let i = 0, il = modelFiles.length; i < il; i++) {
       let modelFile = modelFiles[i];
@@ -108,32 +96,31 @@ class ModelModule extends BaseModule {
       }
     }
 
-    buildModelRelations(models);
-
-    Object.defineProperties(models, {
-      '_files': {
-        writable:     true,
-        enumberable:  false,
-        configurable: true,
-        value:        modelFiles,
-      },
-    });
+    models = connection.registerModels(models);
 
     return models;
   }
 
-  getModel(name) {
-    let models = this.models;
-    return models[name];
+  getModel(modelName) {
+    let application = this.getApplication();
+    let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
+    if (!connection)
+      return;
+
+    return connection.getModel(modelName);
   }
 
   getModels() {
-    return this.models || {};
+    let application = this.getApplication();
+    let connection  = (typeof application.getDBConnection === 'function') ? application.getDBConnection() : null;
+    if (!connection)
+      return;
+
+    return connection.getModels();
   }
 
   async start(options) {
-    let models = await this.loadModels(options.modelsPath);
-    this.models = models;
+    await this.loadModels(options.modelsPath);
   }
 
   async stop() {