mythix 3.0.0 → 4.0.2

package/src/controllers/controller-utils.js

@@ -1,24 +0,0 @@
-'use strict';
-
-const { ControllerBase } = require('./controller-base');
-
-function defineController(controllerName, definer, _parent) {
-  let parentKlass = _parent || ControllerBase;
-
-  return function({ application, server }) {
-    const Klass = definer({
-      Parent: parentKlass,
-      application,
-      server,
-      controllerName,
-    });
-
-    Klass.getControllerName = () => controllerName;
-
-    return { [controllerName]: Klass };
-  };
-}
-
-module.exports = {
-  defineController,
-};

package/src/controllers/index.js

@@ -1,19 +0,0 @@
-'use strict';
-
-const { ControllerBase }              = require('./controller-base');
-const { ControllerModule }            = require('./controller-module');
-const { generateClientAPIInterface }  = require('./generate-client-api-interface');
-
-const {
-  defineController,
-} = require('./controller-utils');
-
-const Routes = require('./routes');
-
-module.exports = {
-  ControllerBase,
-  ControllerModule,
-  Routes,
-  defineController,
-  generateClientAPIInterface,
-};

package/src/controllers/routes/index.js

@@ -1,31 +0,0 @@
-'use strict';
-
-const {
-  RouteScopeBase,
-} = require('./route-scope-base');
-
-const {
-  RouteScope,
-} = require('./route-scope');
-
-const {
-  RouteCapture,
-} = require('./route-capture');
-
-const {
-  RouteEndpoint,
-} = require('./route-endpoint');
-
-module.exports = {
-  // Route scope base
-  RouteScopeBase,
-
-  // Route scope
-  RouteScope,
-
-  // Route capture
-  RouteCapture,
-
-  // Route endpoint
-  RouteEndpoint,
-};

package/src/http-server/index.d.ts

@@ -1,3 +0,0 @@
-export * from './http-server';
-export * as HTTPErrors from './http-errors';
-export { statusCodeToMessage } from '../utils/http-utils';

package/src/http-server/index.js

@@ -1,16 +0,0 @@
-'use strict';
-
-const {
-  statusCodeToMessage,
-} = require('../utils/http-utils');
-
-const { HTTPServer }        = require('./http-server');
-const HTTPErrors            = require('./http-errors');
-const { HTTPServerModule }  = require('./http-server-module');
-
-module.exports = {
-  HTTPErrors,
-  HTTPServer,
-  HTTPServerModule,
-  statusCodeToMessage,
-};

package/src/index.d.ts

@@ -1,49 +0,0 @@
-// Application
-export * from './interfaces/common';
-export * from './application';
-export * from './logger';
-
-// CLI Utils
-export * as CLI from './cli';
-export { defineCommand } from './cli';
-
-// Utils
-export * as Utils from './utils';
-export {
-  HTTPUtils,
-  CryptoUtils,
-  TestUtils,
-  MimeUtils,
-} from './utils';
-
-// Models
-export * as Models from './models';
-export * from './models';
-
-// Controllers
-export * as Controllers from './controllers';
-export * from './controllers';
-
-// HTTPServer
-export * as HTTP from './http-server';
-export * from './http-server';
-
-// Tasks
-export * as Tasks from './tasks';
-export * from './tasks';
-
-import * as _Modules from './modules';
-import * as _ModelModule from './models/model-module';
-import * as _ControllerModule from './controllers/controller-module';
-import * as _HTTPServerModule from './http-server/http-server-module';
-import * as _TaskModule from './tasks/task-module';
-
-export declare namespace Modules {
-  export import ModelModule = _ModelModule.ModelModule;
-  export import ControllerModule = _ControllerModule.ControllerModule;
-  export import BaseModule = _Modules.BaseModule;
-  export import DatabaseModule = _Modules.DatabaseModule;
-  export import FileWatcherModule = _Modules.FileWatcherModule;
-  export import HTTPServerModule = _HTTPServerModule.HTTPServerModule;
-  export import TaskModule = _TaskModule.TaskModule;
-}

package/src/index.js

@@ -1,47 +0,0 @@
-'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 Utils             = require('./utils');
-const Modules           = require('./modules');
-
-module.exports = {
-  defineCommand:          CLIUtilsScope.defineCommand,
-  defineController:       ControllerScope.defineController,
-  defineModel:            ModelScope.defineModel,
-  registerModel:          ModelScope.registerModel,
-  defineTask:             TasksScope.defineTask,
-
-  CLI:                    CLIUtilsScope,
-  ControllerBase:         ControllerScope.ControllerBase,
-  Controllers:            ControllerScope,
-  CryptoUtils:            Utils.CryptoUtils,
-  HTTP:                   HTTPServerScope,
-  HTTPErrors:             HTTPServerScope.HTTPErrors,
-  HTTPServer:             HTTPServerScope.HTTPServer,
-  HTTPUtils:              Utils.HTTPUtils,
-  TaskBase:               TasksScope.TaskBase,
-  Tasks:                  TasksScope,
-  TestUtils:              Utils.TestUtils,
-  MimeUtils:              Utils.MimeUtils,
-  Model:                  ModelScope.Model,
-  Modules:                {
-    BaseModule:         Modules.BaseModule,
-    DatabaseModule:     Modules.DatabaseModule,
-    FileWatcherModule:  Modules.FileWatcherModule,
-    HTTPServerModule:   HTTPServerScope.HTTPServerModule,
-    ModelModule:        ModelScope.ModelModule,
-    TaskModule:         TasksScope.TaskModule,
-    ControllerModule:   ControllerScope.ControllerModule,
-  },
-
-  Application,
-  Logger,
-  Models: ModelScope,
-  Utils,
-};

package/src/models/index.d.ts

@@ -1,4 +0,0 @@
-export * from './model';
-export * as ModelUtils from './model-utils';
-export { defineModel, registerModel } from './model-utils';
-export * from './migration-model';

package/src/models/index.js

@@ -1,17 +0,0 @@
-'use strict';
-
-const { Model }       = require('./model');
-const { ModelModule } = require('./model-module');
-const { MigrationModel } = require('./migration-model');
-const {
-  defineModel,
-  registerModel,
-} = require('./model-utils');
-
-module.exports = {
-  defineModel,
-  registerModel,
-  Model,
-  ModelModule,
-  MigrationModel,
-};

package/src/models/model-module.d.ts

@@ -1,9 +0,0 @@
-import { ModelClass, Models } from 'mythix-orm';
-import { BaseModule } from '../modules/base-module';
-
-export declare class ModelModule extends BaseModule {
-  getModelFilePaths(modelsPath: string): Array<string>;
-  loadModels(modelsPath: string): Models;
-  getModel(modelName?: string): ModelClass | undefined;
-  getModels(): Models;
-}

package/src/models/model-module.js

@@ -1,130 +0,0 @@
-'use strict';
-
-/* global __dirname */
-
-const Path            = require('path');
-const { BaseModule }  = require('../modules/base-module');
-const {
-  fileNameWithoutExtension,
-  walkDir,
-} = require('../utils');
-
-class ModelModule extends BaseModule {
-  static fileWatcherQueueName = 'models';
-
-  static getModuleName() {
-    return 'ModelModule';
-  }
-
-  static shouldUse(application, options) {
-    if (options.database === false)
-      return false;
-
-    return true;
-  }
-
-  constructor(application) {
-    super(application);
-
-    // Inject methods into the application
-    Object.defineProperties(application, {
-      'getModel': {
-        writable:     true,
-        enumerable:   false,
-        configurable: true,
-        value:        this.getModel.bind(this),
-      },
-      'getModels': {
-        writable:     true,
-        enumerable:   false,
-        configurable: true,
-        value:        this.getModels.bind(this),
-      },
-    });
-  }
-
-  fileWatcherGetMonitorPaths(options) {
-    return [ options.modelsPath ];
-  }
-
-  async fileWatcherHandler(options) {
-    await this.loadModels(options.modelsPath);
-  }
-
-  getModelFilePaths(modelsPath) {
-    let modelFiles = walkDir(modelsPath, {
-      filter: (fullFileName, fileName, stats) => {
-        if (fileName.match(/^_/))
-          return false;
-
-        if (stats.isFile() && !fileNameWithoutExtension(fileName).match(/-model$/))
-          return false;
-
-        return true;
-      },
-    });
-
-    let application = this.getApplication();
-    let options     = application.getOptions();
-
-    if (options.noInternalMigrationTable !== true)
-      modelFiles.push(Path.resolve(__dirname, 'migration-model.js'));
-
-    return modelFiles;
-  }
-
-  loadModels(modelsPath) {
-    let application = this.getApplication();
-    let connection  = (typeof application.getConnection === 'function') ? application.getConnection() : null;
-    let dbConfig    = (typeof application.getDBConfig === 'function') ? application.getDBConfig() : null;
-    let modelFiles  = this.getModelFilePaths(modelsPath);
-    let models      = {};
-    let args        = { application, connection, dbConfig };
-
-    for (let i = 0, il = modelFiles.length; i < il; i++) {
-      let modelFile = modelFiles[i];
-
-      try {
-        let modelGenerator = require(modelFile);
-        if (modelGenerator.__esModule)
-          modelGenerator = modelGenerator['default'];
-
-        Object.assign(models, modelGenerator(args));
-      } catch (error) {
-        this.getLogger().error(`Error while loading model ${modelFile}: `, error);
-        throw error;
-      }
-    }
-
-    models = connection.registerModels(models, { forceConnectionBinding: true });
-
-    return models;
-  }
-
-  getModel(modelName) {
-    let application = this.getApplication();
-    let connection  = (typeof application.getConnection === 'function') ? application.getConnection() : null;
-    if (!connection)
-      return;
-
-    return connection.getModel(modelName);
-  }
-
-  getModels() {
-    let application = this.getApplication();
-    let connection  = (typeof application.getConnection === 'function') ? application.getConnection() : null;
-    if (!connection)
-      return {};
-
-    return connection.getModels();
-  }
-
-  async start(options) {
-    await this.loadModels(options.modelsPath);
-  }
-
-  async stop() {
-  }
-}
-
-module.exports = { ModelModule };

package/src/models/model-utils.d.ts

@@ -1,20 +0,0 @@
-import { ConnectionBase, Types } from 'mythix-orm';
-import { Application } from '../application';
-
-export declare interface DefineModelContext<T> {
-  Parent: T;
-  Types: typeof Types;
-  connection: ConnectionBase;
-  modelName: string;
-  application: Application;
-}
-
-export declare function registerModel<T>(
-  Model: T,
-): (context: { application: Application, connection: ConnectionBase }) => T;
-
-export declare function defineModel<T>(
-  modelName: string,
-  definer: (context: DefineModelContext<T>) => T,
-  parent?: T,
-): (context: { application: Application, connection: ConnectionBase }) => T;

package/src/models/model-utils.js

@@ -1,46 +0,0 @@
-'use strict';
-
-const { Types } = require('mythix-orm');
-const { Model: ModelBase } = require('./model');
-
-function _setupModel(modelName, _Model, { application }) {
-  let Model       = _Model;
-  let tableName   = Model.getTableName();
-  let tablePrefix = application.getDBTablePrefix();
-
-  if (tablePrefix)
-    tableName = `${tablePrefix}${tableName}`.replace(/_+/g, '_');
-
-  Model.getTableName  = () => tableName;
-  Model.getModelName  = () => modelName;
-  Model.getApplication = () => application;
-
-  return { [modelName]: Model };
-}
-
-function registerModel(Model) {
-  return function({ application, connection }) {
-    return _setupModel(Model.getModelName(), Model, { application, connection });
-  };
-}
-
-function defineModel(modelName, definer, _parent) {
-  return function({ application, connection }) {
-    let definerArgs = {
-      Parent:   (_parent) ? _parent : ModelBase,
-      Types,
-      connection,
-      modelName,
-      application,
-    };
-
-    let Model = definer(definerArgs);
-
-    if (typeof Model.onModelClassCreate === 'function')
-      Model = Model.onModelClassCreate(Model, definerArgs);
-
-    return _setupModel(modelName, Model, { application, connection });
-  };
-}
-
-module.exports = { defineModel, registerModel };

package/src/models/model.d.ts

@@ -1,20 +0,0 @@
-import { Application } from '../application';
-import { Logger } from '../logger';
-import { ConnectionBase, Model as _Model, ModelClass } from 'mythix-orm';
-import { DefineModelContext } from './model-utils';
-
-export declare class Model extends _Model {
-  declare public static getTableName: () => string;
-  declare public static getModelName: () => string;
-  declare public static getApplication: () => Application;
-  declare public static getLogger: () => Logger;
-  declare public static _getConnection: (connection?: ConnectionBase) => ConnectionBase;
-  declare public static onModelClassFinalized?: (Model: ModelClass, definerArgs: DefineModelContext<Model>) => ModelClass;
-
-  public getApplication(): Application;
-  public getLogger(): Logger;
-  public getConnection(connection?: ConnectionBase): ConnectionBase;
-
-  // Deprecated
-  public getDBConnection(connection?: ConnectionBase): ConnectionBase;
-}

package/src/models/model.js

@@ -1,65 +0,0 @@
-'use strict';
-
-const { Model: _Model } = require('mythix-orm');
-
-class Model extends _Model {
-  static getModel(modelName) {
-    if (modelName) {
-      let connection = this.getConnection();
-      return connection.getModel(modelName);
-    }
-
-    return this;
-  }
-
-  static getModels() {
-    let connection = this.getConnection();
-    return connection.getModels();
-  }
-
-  getModel(modelName) {
-    return this.constructor.getModel(modelName);
-  }
-
-  getModels() {
-    return this.constructor.getModels();
-  }
-
-  getApplication() {
-    return this.constructor.getApplication();
-  }
-
-  getLogger() {
-    let application = this.getApplication();
-    return application.getLogger();
-  }
-
-  getConnection(connection) {
-    if (connection)
-      return connection;
-
-    let application = this.getApplication();
-    if (!application)
-      return null;
-
-    if (typeof application.getConnection === 'function')
-      return application.getConnection();
-
-    return null;
-  }
-
-  // Deprecated
-  getDBConnection(connection) {
-    return this.getConnection(connection);
-  }
-
-  static _getConnection(_connection) {
-    let connection = super._getConnection(_connection);
-    if (connection)
-      return connection;
-
-    return this.getApplication().getConnection();
-  }
-}
-
-module.exports = { Model };

package/src/modules/file-watcher-module.d.ts

@@ -1,13 +0,0 @@
-import { GenericObject } from '../interfaces/common';
-import { BaseModule } from './base-module';
-
-export declare class FileWatcherModule extends BaseModule {
-  public getMonitoredPaths(options?: GenericObject): Array<string>;
-  public isWatchedFile(monitoredPaths: Array<string>, filePath: string): boolean;
-  public getFileScope(options: GenericObject, filePath: string): string;
-  public autoReload(enable?: boolean, shuttingDown?: boolean): Promise<void>;
-  public watchedFilesChanged(files: GenericObject): Promise<void>;
-
-  declare public fileWatcher: any;
-  declare public watchedPathsCache: Array<string>;
-}