mythix 2.4.14 → 2.5.1

package/src/tasks/task-utils.js

@@ -1,7 +1,7 @@
 'use strict';
 
-const Nife          = require('nife');
-const { TaskBase }  = require('./task-base');
+const Nife      = require('nife');
+const TaskBase  = require('./task-base');
 
 const SECONDS_PER_MINUTE      = 60;
 const MINUTES_PER_HOUR        = 60;
@@ -54,20 +54,20 @@ class TimeHelpers {
     return new TimeHelpers();
   }
 
-  days(number) {
-    return this.clone(number);
+  days(days) {
+    return this.clone(days);
   }
 
-  hours(number) {
-    return this.clone(undefined, number);
+  hours(hours) {
+    return this.clone(undefined, hours);
   }
 
-  minutes(number) {
-    return this.clone(undefined, undefined, number);
+  minutes(minutes) {
+    return this.clone(undefined, undefined, minutes);
   }
 
-  seconds(number) {
-    return this.clone(undefined, undefined, undefined, number);
+  seconds(seconds) {
+    return this.clone(undefined, undefined, undefined, seconds);
   }
 
   totalSeconds() {
@@ -125,6 +125,6 @@ function defineTask(taskName, definer, _parent) {
   };
 }
 
-module.exports = {
-  defineTask,
-};
+defineTask.TimeHelpers = TimeHelpers;
+
+module.exports = { defineTask };

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

@@ -0,0 +1,3 @@
+import { GenericObject } from '../interfaces/common';
+
+export declare function wrapConfig(config?: GenericObject): { CONFIG: GenericObject, ENV: (key: string, defaultValue) => any; };

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

@@ -0,0 +1,6 @@
+
+export declare function randomBytes(length: number): Buffer;
+export declare function MD5(data: string): string;
+export declare function SHA256(data: string): string;
+export declare function SHA512(data: string): string;
+export declare function randomHash(type?: string, length?: number): string;

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

@@ -0,0 +1,10 @@
+import { Stats } from 'fs';
+
+export declare interface WalkDirOptions {
+  filter: RegExp | ((fullFileName: string, fileName: string, stats: Stats, rootPath: string, depth: number) => boolean);
+}
+
+export declare type WalkDirCallback = () => void;
+
+export declare function walkDir(rootPath: string, options?: WalkDirOptions | WalkDirCallback, callback?: WalkDirCallback);
+export declare function fileNameWithoutExtension(fileName: string): string;

package/src/utils/http-interface.d.ts

@@ -0,0 +1,25 @@
+import { GenericObject } from '../interfaces/common';
+
+export declare class HTTPInterface {
+  declare public defaultURL: string | null;
+  declare public defaultHeaders: GenericObject;
+
+  public constructor();
+  public getDefaultURL(): string;
+  public setDefaultURL(url: string): void;
+  public getDefaultHeader(headerName: string): string | undefined;
+  public getDefaultHeaders(): GenericObject;
+  public setDefaultHeader(headerName: string, value: string): void;
+  public setDefaultHeaders(headers: { [ key: string ]: string }): void;
+  public keysToLowerCase(obj: { [ key: string ]: string }): { [ key: string ]: string };
+  public makeRequest(requestOptions: GenericObject): Promise<any>;
+  public getRequestOptions(url: string, options: GenericObject, method: string): GenericObject;
+  public request(url: string, options: GenericObject): Promise<any>;
+  public getRequest(url: string, options: GenericObject): Promise<any>;
+  public postRequest(url: string, options: GenericObject): Promise<any>;
+  public patchRequest(url: string, options: GenericObject): Promise<any>;
+  public putRequest(url: string, options: GenericObject): Promise<any>;
+  public deleteRequest(url: string, options: GenericObject): Promise<any>;
+  public headRequest(url: string, options: GenericObject): Promise<any>;
+  public optionsRequest(url: string, options: GenericObject): Promise<any>;
+}

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

@@ -0,0 +1,3 @@
+
+export declare function dataToQueryString(data: any, nameFormatter?: (name: string, value: any) => string, resolveInitial?: () => string): string;
+export declare function statusCodeToMessage(statusCode: number): string;

package/src/utils/index.d.ts

@@ -0,0 +1,7 @@
+export * from './file-utils';
+export * from './config-utils';
+export * as HTTPUtils from './http-utils';
+export * as CryptoUtils from './crypto-utils';
+export * as TestUtils from './test-utils';
+export * as MimeUtils from './mime-utils';
+export * from './http-interface';

package/src/utils/index.js

@@ -15,11 +15,11 @@ const { HTTPInterface } = require('./http-interface');
 
 module.exports = {
   CryptoUtils,
-  fileNameWithoutExtension,
   HTTPUtils,
   MimeUtils,
   TestUtils,
+  HTTPInterface,
+  fileNameWithoutExtension,
   walkDir,
   wrapConfig,
-  HTTPInterface,
 };

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

@@ -0,0 +1,5 @@
+
+export declare function getFileExtensionFromMimeType(mimeType: string): string | undefined;
+export declare function getFilenameExtension(fileName: string): string | undefined;
+export declare function getMimeTypeFromFileExtension(fileExtension: string): string | undefined;
+export declare function getMimeTypeFromFilename(fileName: string): string | undefined;

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

@@ -0,0 +1,3 @@
+import { ApplicationClass } from '../application';
+
+export declare function createTestApplication(appClass: ApplicationClass): ApplicationClass;

package/src/utils/test-utils.js

@@ -4,9 +4,9 @@
 
 const Nife                  = require('nife');
 const { Utils }             = require('mythix-orm');
-const { Logger }            = require('../logger');
+const Logger                = require('../logger');
+const DatabaseModule        = require('../modules/database-module');
 const { HTTPInterface }     = require('./http-interface');
-const { DatabaseModule }    = require('../modules/database-module');
 const { HTTPServerModule }  = require('../http-server/http-server-module');
 
 class TestDatabaseModule extends DatabaseModule {
@@ -52,16 +52,16 @@ class TestHTTPServerModule extends HTTPServerModule {
   }
 }
 
-function createTestApplication(Application) {
-  const Klass = class TestApplication extends Application {
-    static APP_NAME = `${(Nife.isNotEmpty(Application.APP_NAME)) ? Application.APP_NAME : 'mythix'}_test`;
+function createTestApplication(ApplicationClass) {
+  const Klass = class TestApplication extends ApplicationClass {
+    static APP_NAME = `${(Nife.isNotEmpty(ApplicationClass.APP_NAME)) ? ApplicationClass.APP_NAME : 'mythix'}_test`;
 
     // Swap out modules for test config
     static getDefaultModules() {
-      let defaultModules = Application.getDefaultModules();
+      let defaultModules = ApplicationClass.getDefaultModules();
 
-      defaultModules = Application.replaceModule(defaultModules, DatabaseModule, TestDatabaseModule);
-      defaultModules = Application.replaceModule(defaultModules, HTTPServerModule, TestHTTPServerModule);
+      defaultModules = ApplicationClass.replaceModule(defaultModules, DatabaseModule, TestDatabaseModule);
+      defaultModules = ApplicationClass.replaceModule(defaultModules, HTTPServerModule, TestHTTPServerModule);
 
       return defaultModules;
     }
@@ -229,6 +229,4 @@ function createTestApplication(Application) {
   return Klass;
 }
 
-module.exports = {
-  createTestApplication,
-};
+module.exports = { createTestApplication };

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

@@ -1,120 +0,0 @@
-'use strict';
-
-const Nife = require('nife');
-const {
-  buildPatternMatcher,
-  buildMethodMatcher,
-  buildContentTypeMatcher,
-} = require('../../controllers/controller-utils');
-
-const CONDITIONAL_OBJECT_HELPERS = {
-  'controller':   (request) => Nife.get(request, 'routeInfo.controller'),
-  'path':         (request) => Nife.get(request, 'url'),
-  'methods':      (request) => Nife.get(request, 'method'),
-  'contentType':  (request) => Nife.get(request, 'headers.content-type'),
-};
-
-function conditional(middleware, conditions) {
-  const createConditionsFromObject = (obj) => {
-    let helperKeys  = Object.keys(CONDITIONAL_OBJECT_HELPERS);
-    let keys        = Object.keys(obj);
-    let matchers    = [];
-
-    for (let i = 0, il = keys.length; i < il; i++) {
-      let key = keys[i];
-      if (helperKeys.indexOf(key) < 0)
-        continue;
-
-      let helper  = CONDITIONAL_OBJECT_HELPERS[key];
-      let value   = obj[key];
-
-      if (Nife.instanceOf(value, 'string', 'array', RegExp)) {
-        if (key === 'methods')
-          value = buildMethodMatcher(value);
-        else if (key === 'contentType')
-          value = buildContentTypeMatcher(value);
-        else
-          value = buildPatternMatcher(value);
-      } else if (typeof value !== 'function') {
-        continue;
-      }
-
-      matchers.push({
-        matcher: value,
-        helper,
-      });
-    }
-
-    if (!matchers.length)
-      throw new Error('No matchable patterns found');
-
-    return function patternMatcher(request) {
-      for (let i = 0, il = matchers.length; i < il; i++) {
-        let matcher = matchers[i];
-        let helper  = matcher.helper;
-        let value   = helper.call(this, request);
-
-        if (!matcher.matcher.call(this, value))
-          return false;
-      }
-
-      return true;
-    };
-  };
-
-  const createConditionsFromArray = (conditionsToCreate) => {
-    let matchers = [];
-    for (let i = 0, il = conditionsToCreate.length; i < il; i++) {
-      let condition = conditionsToCreate[i];
-
-      if (typeof condition === 'function')
-        matchers.push(condition);
-      else if (Nife.instanceOf(condition, 'object'))
-        matchers.push(createConditionsFromObject(condition));
-    }
-
-    return function patternMatcher(request) {
-      for (let i = 0, il = matchers.length; i < il; i++) {
-        let matcher = matchers[i];
-        if (!matcher.call(this, request))
-          return false;
-      }
-
-      return true;
-    };
-  };
-
-  let conditionChecker;
-
-  if (Nife.instanceOf(conditions, 'object'))
-    conditionChecker = createConditionsFromObject(conditions);
-  else if (Nife.instanceOf(conditions, 'array'))
-    conditionChecker = createConditionsFromArray(conditions);
-  else if (Nife.instanceOf(conditions, 'function'))
-    conditionChecker = conditions;
-  else
-    throw new Error('Invalid condition supplied');
-
-  return function(request, response, next) {
-    if (!conditionChecker.call(this, request))
-      return next();
-
-    return middleware.call(this, request, response, next);
-  };
-}
-
-function jsonParser() {
-  return function(request, response, next) {
-    if (('' + request.headers['content-type']).match(/application\/json/i) && typeof request.body === 'string') {
-      request.rawBody = request.body;
-      request.body = JSON.parse(request.body);
-    }
-
-    return next();
-  };
-}
-
-module.exports = {
-  conditional,
-  jsonParser,
-};

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

@@ -1,7 +0,0 @@
-'use strict';
-
-const defaultMiddleware = require('./default-middleware');
-
-module.exports = Object.assign({},
-  defaultMiddleware,
-);