mythix 3.0.0 → 4.0.2

package/{src/utils/mime-utils.js → lib/utils/mime-utils.mjs}

@@ -1,6 +1,4 @@
-'use strict';
-
-const Nife = require('nife');
+import Nife from 'nife';
 
 const MIME_TYPES = {
   '3g2':    'video/3gpp2',
@@ -88,19 +86,19 @@ const MIME_EXTENSION_EXCEPTIONS = {
   'tif':  'tiff',
 };
 
-function getFilenameExtension(fileName) {
+export function getFilenameExtension(fileName) {
   if (Nife.isEmpty(fileName))
     return;
 
   return (!fileName.match(/\.[^./\\]+$/)) ? null : fileName.replace(/^.*?([^./]+)$/, '$1');
 }
 
-function getMimeTypeFromFileExtension(extension) {
+export function getMimeTypeFromFileExtension(extension) {
   let ext = ('' + extension).toLowerCase();
   return MIME_TYPES[ext];
 }
 
-function getFileExtensionFromMimeType(_mimeType) {
+export function getFileExtensionFromMimeType(_mimeType) {
   let mimeType    = ('' + _mimeType).toLowerCase();
   let extensions  = Object.keys(MIME_TYPES).sort();
 
@@ -117,13 +115,6 @@ function getFileExtensionFromMimeType(_mimeType) {
   }
 }
 
-function getMimeTypeFromFilename(fileName) {
+export function getMimeTypeFromFilename(fileName) {
   return getMimeTypeFromFileExtension(getFilenameExtension(fileName));
 }
-
-module.exports = {
-  getFileExtensionFromMimeType,
-  getFilenameExtension,
-  getMimeTypeFromFileExtension,
-  getMimeTypeFromFilename,
-};

package/{src/utils/test-utils.js → lib/utils/test-utils.mjs}

@@ -1,13 +1,9 @@
-'use strict';
-
-/* global process */
-
-const Nife                  = require('nife');
-const { Utils }             = require('mythix-orm');
-const { Logger }            = require('../logger');
-const { DatabaseModule }    = require('../modules/database-module');
-const { HTTPInterface }     = require('./http-interface');
-const { HTTPServerModule }  = require('../http-server/http-server-module');
+import Nife                   from 'nife';
+import { Utils }              from 'mythix-orm';
+import { Logger }             from '../logger.mjs';
+import { DatabaseModule }     from '../modules/database-module.mjs';
+import { HTTPServerModule }   from '../http/http-server-module.mjs';
+import { HTTPInterface }      from '../http/http-interface.mjs';
 
 class TestDatabaseModule extends DatabaseModule {
   getTablePrefix() {
@@ -52,31 +48,25 @@ class TestHTTPServerModule extends HTTPServerModule {
   }
 }
 
-function createTestApplication(ApplicationClass) {
+export function createTestApplication(ApplicationClass) {
   const Klass = class TestApplication extends ApplicationClass {
     // Swap out modules for test config
-    static getDefaultModules() {
-      let defaultModules = ApplicationClass.getDefaultModules();
-
-      defaultModules = ApplicationClass.replaceModule(defaultModules, DatabaseModule, TestDatabaseModule);
-      defaultModules = ApplicationClass.replaceModule(defaultModules, HTTPServerModule, TestHTTPServerModule);
-
-      return defaultModules;
+    static getModules() {
+      return {
+        ...super.getModules(),
+        database:   TestDatabaseModule,
+        httpServer: TestHTTPServerModule,
+      };
     }
 
     constructor(_opts) {
       let opts = Nife.extend(true, {
         environment:  'test',
-        autoReload:   false,
-        runTasks:     false,
-        testMode:     true,
-        appName:      `${(Nife.isNotEmpty(ApplicationClass.APP_NAME)) ? ApplicationClass.APP_NAME : 'mythix'}_test`,
+        tasks:        false,
       }, _opts || {});
 
       super(opts);
 
-      process.setMaxListeners(0);
-
       Object.defineProperties(this, {
         'httpInterface': {
           writable:     true,
@@ -166,22 +156,6 @@ function createTestApplication(ApplicationClass) {
       }
     }
 
-    async hijackModel(modelName, callback, runner) {
-      let models = this.getModels();
-      let OriginalModel = models[modelName];
-
-      try {
-        let Klass = callback.call(this, OriginalModel);
-
-        let connection = this.getConnection();
-        connection.registerModel(Klass);
-
-        return await runner.call(this, Klass);
-      } finally {
-        models[modelName] = OriginalModel;
-      }
-    }
-
     getDefaultURL(...args) {
       return this.httpInterface.getDefaultURL(...args);
     }
@@ -241,5 +215,3 @@ function createTestApplication(ApplicationClass) {
 
   return Klass;
 }
-
-module.exports = { createTestApplication };

package/package.json

@@ -1,8 +1,9 @@
 {
   "name": "mythix",
-  "version": "3.0.0",
+  "version": "4.0.2",
   "description": "Mythix is a NodeJS web-app framework",
-  "main": "src/index",
+  "main": "lib/index.mjs",
+  "type": "module",
   "scripts": {
     "test": "node ./node_modules/.bin/jasmine",
     "test-watch": "watch 'clear ; node --trace-warnings ./node_modules/.bin/jasmine' . --wait=3 --interval=1"
@@ -20,15 +21,14 @@
   "homepage": "https://github.com/th317erd/mythix#readme",
   "devDependencies": {
     "@spothero/eslint-plugin-spothero": "github:spothero/eslint-plugin-spothero",
-    "@types/node": "^20.2.5",
+    "@types/node": "^20.3.1",
     "colors": "^1.4.0",
     "diff": "^5.1.0",
     "eslint": "^8.42.0",
     "jasmine": "^5.0.1"
   },
   "dependencies": {
-    "@types/events": "^3.0.0",
-    "chokidar": "^3.5.3",
+    "@types/express": "^4.17.17",
     "cmded": "^1.2.5",
     "express": "^4.18.2",
     "express-busboy": "github:th317erd/express-busboy#0754a570d7979097b31e48655b80d3fcd628d4e4",

package/src/cli/cli-utils.d.ts

@@ -1,80 +0,0 @@
-import { HelpInterface, Runner } from 'cmded';
-import { Stats } from 'fs';
-import { ConnectionBase } from 'mythix-orm';
-import { Application, ApplicationClass, ApplicationOptions } from '../application';
-import { GenericObject } from '../interfaces/common';
-import { Logger } from '../logger';
-
-export declare type CommandClass = typeof CommandBase;
-
-export declare type CommandClasses = { [key: string]: CommandClass };
-
-export declare type FileFilterCallback = (fullFileName: string, fileName: string, stats?: Stats) => boolean;
-
-export declare class CommandBase {
-  declare public static commands: GenericObject;
-  declare public static commandName: string;
-  declare public static applicationConfig?: GenericObject | (() => GenericObject);
-  declare public static commandArguments?: () => { help: HelpInterface, runner: Runner };
-  declare public static runtimeArguments?: { [key: string]: Array<string> };
-  public static execute(): Promise<void>;
-
-  declare public application: Application;
-  declare public options: GenericObject;
-
-  constructor(application: Application, options?: GenericObject);
-  getOptions(): GenericObject;
-  getApplication(): Application;
-  getLogger(): Logger;
-  getConnection(connection?: ConnectionBase): ConnectionBase;
-
-  // Deprecated
-  getDBConnection(connection?: ConnectionBase): ConnectionBase;
-
-  spawnCommand(
-    command: string,
-    args: Array<string>,
-    options?: GenericObject
-  ): Promise<{ stdout: string, stderr: string, error: any, code: number }>;
-
-  getCommandFiles(filterFunc?: FileFilterCallback): Array<string>;
-}
-
-export declare interface DefineCommandContext {
-  Parent: CommandClass;
-  commandName: string;
-}
-
-export declare function loadMythixConfig(
-  mythixConfigPath: string,
-  appRootPath: string
-): GenericObject;
-
-export declare function loadCommand(name: string): CommandClass;
-
-export declare function loadCommands(
-  applicationCommandsPath: string,
-  skip: Array<string>
-): CommandClasses;
-
-export declare function defineCommand(
-  commandName: string,
-  definer: (context: DefineCommandContext) => CommandClass,
-  parent?: string | CommandClass,
-): CommandClass;
-
-export declare function createApplication(
-  applicationClass: ApplicationClass,
-  options?: ApplicationOptions
-): Application;
-
-export declare function executeCommand(
-  config: GenericObject,
-  appOptions: ApplicationOptions,
-  commandContext: GenericObject,
-  CommandKlass: CommandClass,
-  argv: Array<string>
-): void;
-
-export declare function getInternalCommandsPath(): string;
-export declare function getCommandFiles(commandsPath: string, filterFunc?: FileFilterCallback): Array<string>;