@haventech/supertype - npm Package Compare versions

Comparing version 6.0.0-beta.8 to 6.0.0-beta.n1

dist/decorators.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remote = exports.property = exports.supertypeClass = void 0;
+exports.remote = exports.property = exports.supertypeClass = exports.Supertype = void 0;
 var Supertype_1 = require("./Supertype");
@@ -5,0 +5,0 @@ Object.defineProperty(exports, "Supertype", { enumerable: true, get: function () { return Supertype_1.Supertype; } });

dist/index.js

@@ -23,3 +23,3 @@ "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SupertypeSession = exports.amorphicStatic = void 0;
+exports.remote = exports.property = exports.supertypeClass = exports.Supertype = exports.BuildSupertypeConfig = exports.SupertypeConfig = exports.SupertypeLogger = exports.SupertypeSession = exports.amorphicStatic = exports.StatsdHelper = void 0;
 var ObjectTemplate_1 = require("./ObjectTemplate");
@@ -26,0 +26,0 @@ ObjectTemplate_1.ObjectTemplate.init();

dist/ObjectTemplate.d.ts

@@ -5,3 +5,3 @@ import * as serializer from './serializer';
 import { Config, ApplicationNameToConfigMap } from '@haventech/amorphic-contracts';
-export declare type CreateTypeForName = {
+export type CreateTypeForName = {
     name?: string;
@@ -12,3 +12,3 @@ toClient?: boolean;
 };
-export declare type Getter = {
+export type Getter = {
     get: any;
@@ -20,3 +20,3 @@ };
  */
-export declare type ConstructorTypeBase = Function & {
+export type ConstructorTypeBase = Function & {
     amorphicClassName: any;
@@ -47,3 +47,3 @@ __shadowParent__: any;
 }
-export declare type ObjectTemplateClone = typeof ObjectTemplate;
+export type ObjectTemplateClone = typeof ObjectTemplate;
 /**
@@ -73,3 +73,2 @@ * the og ObjectTemplate, what everything picks off of
     static amorphicStatic: typeof ObjectTemplate;
-    private static moduleName;
     static config: {
@@ -76,0 +75,0 @@ nconf: Config;

dist/StatsdHelper.d.ts

@@ -1,2 +0,2 @@
-declare type hrTime = [number, number];
+type hrTime = [number, number];
 /**
@@ -3,0 +3,0 @@ * mostly static utility functions to assist supertype in handling statsd operations

dist/Supertype.d.ts

 import { ObjectTemplate } from './ObjectTemplate';
-export declare type Constructable = new (...args: any[]) => {};
+export type Constructable = new (...args: any[]) => {};
 /**
@@ -4,0 +4,0 @@ * This is the base class for typescript classes.

dist/SupertypeConfig.js

@@ -54,3 +54,3 @@ "use strict";
     if (!rootDir) {
-        throw new Error("Valid root path expected. rootDir[" + rootDir + "]");
+        throw new Error("Valid root path expected. rootDir[".concat(rootDir, "]"));
     }
@@ -64,3 +64,3 @@ else {
         if (envName) {
-            loadConfigFile(rootConfig.internalConfigStore, 'root_env', rootDir, "config_" + envName + ".json");
+            loadConfigFile(rootConfig.internalConfigStore, 'root_env', rootDir, "config_".concat(envName, ".json"));
         }
@@ -79,4 +79,4 @@ loadConfigFile(rootConfig.internalConfigStore, 'root_secure', rootDir, "config_secure.json");
 function buildAppSpecificConfigStore(app, rootDir, envName) {
-    var appPath = rootDir + "/" + app; // Location of the App relative to root
-    var appCommonPath = rootDir + "/apps/common"; // Location of the common folder relative to root
+    var appPath = "".concat(rootDir, "/").concat(app); // Location of the App relative to root
+    var appCommonPath = "".concat(rootDir, "/apps/common"); // Location of the common folder relative to root
     var config = new SupertypeConfig();
@@ -86,3 +86,3 @@ var appCfgApi = config.internalConfigStore;
     if (envName) {
-        loadConfigFile(appCfgApi, 'app_env', appPath, "config_" + envName + ".json");
+        loadConfigFile(appCfgApi, 'app_env', appPath, "config_".concat(envName, ".json"));
     }
@@ -93,3 +93,3 @@ loadConfigFile(appCfgApi, 'app_secure', appPath, "config_secure.json");
     if (envName) {
-        loadConfigFile(appCfgApi, 'common_env', appCommonPath, "config_" + envName + ".json");
+        loadConfigFile(appCfgApi, 'common_env', appCommonPath, "config_".concat(envName, ".json"));
     }
@@ -100,3 +100,3 @@ loadConfigFile(appCfgApi, 'common_secure', appCommonPath, "config_secure.json");
     if (envName) {
-        loadConfigFile(appCfgApi, 'root_env', rootDir, "config_" + envName + ".json");
+        loadConfigFile(appCfgApi, 'root_env', rootDir, "config_".concat(envName, ".json"));
     }
@@ -109,8 +109,8 @@ loadConfigFile(appCfgApi, 'root_secure', rootDir, "config_secure.json");
     try {
-        config.file(name, appPath + "/" + fileName);
+        config.file(name, "".concat(appPath, "/").concat(fileName));
     }
     catch (err) {
-        console.debug("Error loading " + appPath + "/" + fileName + " to config");
+        console.debug("Error loading ".concat(appPath, "/").concat(fileName, " to config"));
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeConfig.js","sourceRoot":"","sources":["../src/SupertypeConfig.ts"],"names":[],"mappings":"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","sourcesContent":["import * as nconf from 'nconf';\nimport {Provider} from 'nconf';\nimport {Config, ApplicationNameToConfigMap} from '@haventech/amorphic-contracts';\n\n\nfunction createNewNConfProvider(): Provider {\n    return new nconf.Provider().argv().env({separator: '__'});\n}\n\n/**\n * Deprecating loadFile for just 'file'\n */\nexport class SupertypeConfig implements Config {\n\n    internalConfigStore: Provider;\n    constructor() {\n        this.internalConfigStore = createNewNConfProvider();\n    }\n\n    /**\n     * Gets a value with a key\n     *\n     * @param key\n     * @returns {*}\n     */\n    get(key) {\n        return this.internalConfigStore.get(key);\n    }\n\n    /**\n     * Sets a value with a key\n     *\n     * @param key\n     * @param value\n     * @returns {*}\n     */\n    set(key, value) {\n        return this.internalConfigStore.set(key, value);\n    }\n\n    /**\n     * Load a configuration file into store\n     *\n     * @param fileKey\n     * @param file\n     */\n    loadFile(fileKey, file) {\n        this.internalConfigStore.file(fileKey, file);\n    };\n}\n\n/**\n * Same type as the AmorphicConfigBuilder build function as specified in amorphic-contracts\n * @param rootDir\n */\nexport function BuildSupertypeConfig(rootDir: string): ApplicationNameToConfigMap {\n    const rootConfig = new SupertypeConfig();\n    if (!rootDir) {\n        throw new Error(`Valid root path expected. rootDir[${rootDir}]`);\n    }\n    else {\n        const configStore: ApplicationNameToConfigMap = {};\n        let envName = rootConfig.internalConfigStore.get('APP_ENV');\n\n        if (envName) {\n            envName = envName.toLowerCase();\n        }\n\n        if (envName) {\n            loadConfigFile(rootConfig.internalConfigStore, 'root_env', rootDir, `config_${envName}.json`);\n        }\n        loadConfigFile(rootConfig.internalConfigStore, 'root_secure', rootDir, `config_secure.json`);\n        loadConfigFile(rootConfig.internalConfigStore, 'root', rootDir, `config.json`);\n\n\n        configStore['root'] = rootConfig;\n\n        const appList = rootConfig.internalConfigStore.get('applications') || {};\n\n        for (let appKey in appList) {\n            configStore[appKey] = buildAppSpecificConfigStore(appList[appKey], rootDir, envName);\n        }\n\n        return configStore;\n    }\n}\n\nfunction buildAppSpecificConfigStore(app: string, rootDir: string, envName?: string): SupertypeConfig {\n    const appPath = `${rootDir}/${app}`; // Location of the App relative to root\n    const appCommonPath = `${rootDir}/apps/common`; // Location of the common folder relative to root\n\n    const config = new SupertypeConfig();\n    const appCfgApi = config.internalConfigStore;\n\n    // Load the new app environment values into the config\n    if(envName) {\n        loadConfigFile(appCfgApi, 'app_env', appPath, `config_${envName}.json`);\n    }\n    loadConfigFile(appCfgApi, 'app_secure', appPath, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'app', appPath, `config.json`);\n\n\n    // Load the common folder configs to this config provider\n    if(envName) {\n        loadConfigFile(appCfgApi, 'common_env', appCommonPath, `config_${envName}.json`);\n    }\n    loadConfigFile(appCfgApi, 'common_secure', appCommonPath, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'common', appCommonPath, `config.json`);\n\n    // Load the root values here too\n    if(envName) {\n        loadConfigFile(appCfgApi, 'root_env', rootDir, `config_${envName}.json`);\n    }\n\n    loadConfigFile(appCfgApi, 'root_secure', rootDir, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'root', rootDir, `config.json`);\n\n    return config;\n}\n\n\nfunction loadConfigFile(config: nconf.Provider, name: string, appPath: string, fileName: string) {\n    try {\n        config.file(name, `${appPath}/${fileName}`);\n    }\n    catch (err) {\n        console.debug(`Error loading ${appPath}/${fileName} to config`);\n    }\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeConfig.js","sourceRoot":"","sources":["../src/SupertypeConfig.ts"],"names":[],"mappings":";;;AAAA,6BAA+B;AAK/B,SAAS,sBAAsB;IAC3B,OAAO,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,IAAI,EAAE,CAAC,GAAG,CAAC,EAAC,SAAS,EAAE,IAAI,EAAC,CAAC,CAAC;AAC9D,CAAC;AAED;;GAEG;AACH;IAGI;QACI,IAAI,CAAC,mBAAmB,GAAG,sBAAsB,EAAE,CAAC;IACxD,CAAC;IAED;;;;;OAKG;IACH,6BAAG,GAAH,UAAI,GAAG;QACH,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7C,CAAC;IAED;;;;;;OAMG;IACH,6BAAG,GAAH,UAAI,GAAG,EAAE,KAAK;QACV,OAAO,IAAI,CAAC,mBAAmB,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACpD,CAAC;IAED;;;;;OAKG;IACH,kCAAQ,GAAR,UAAS,OAAO,EAAE,IAAI;QAClB,IAAI,CAAC,mBAAmB,CAAC,IAAI,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IACjD,CAAC;IAAA,CAAC;IACN,sBAAC;AAAD,CAAC,AArCD,IAqCC;AArCY,0CAAe;AAuC5B;;;GAGG;AACH,SAAgB,oBAAoB,CAAC,OAAe;IAChD,IAAM,UAAU,GAAG,IAAI,eAAe,EAAE,CAAC;IACzC,IAAI,CAAC,OAAO,EAAE;QACV,MAAM,IAAI,KAAK,CAAC,4CAAqC,OAAO,MAAG,CAAC,CAAC;KACpE;SACI;QACD,IAAM,WAAW,GAA+B,EAAE,CAAC;QACnD,IAAI,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;QAE5D,IAAI,OAAO,EAAE;YACT,OAAO,GAAG,OAAO,CAAC,WAAW,EAAE,CAAC;SACnC;QAED,IAAI,OAAO,EAAE;YACT,cAAc,CAAC,UAAU,CAAC,mBAAmB,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAU,OAAO,UAAO,CAAC,CAAC;SACjG;QACD,cAAc,CAAC,UAAU,CAAC,mBAAmB,EAAE,aAAa,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;QAC7F,cAAc,CAAC,UAAU,CAAC,mBAAmB,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;QAG/E,WAAW,CAAC,MAAM,CAAC,GAAG,UAAU,CAAC;QAEjC,IAAM,OAAO,GAAG,UAAU,CAAC,mBAAmB,CAAC,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,CAAC;QAEzE,KAAK,IAAI,MAAM,IAAI,OAAO,EAAE;YACxB,WAAW,CAAC,MAAM,CAAC,GAAG,2BAA2B,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,CAAC;SACxF;QAED,OAAO,WAAW,CAAC;KACtB;AACL,CAAC;AA9BD,oDA8BC;AAED,SAAS,2BAA2B,CAAC,GAAW,EAAE,OAAe,EAAE,OAAgB;IAC/E,IAAM,OAAO,GAAG,UAAG,OAAO,cAAI,GAAG,CAAE,CAAC,CAAC,uCAAuC;IAC5E,IAAM,aAAa,GAAG,UAAG,OAAO,iBAAc,CAAC,CAAC,iDAAiD;IAEjG,IAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;IACrC,IAAM,SAAS,GAAG,MAAM,CAAC,mBAAmB,CAAC;IAE7C,sDAAsD;IACtD,IAAG,OAAO,EAAE;QACR,cAAc,CAAC,SAAS,EAAE,SAAS,EAAE,OAAO,EAAE,iBAAU,OAAO,UAAO,CAAC,CAAC;KAC3E;IACD,cAAc,CAAC,SAAS,EAAE,YAAY,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;IACvE,cAAc,CAAC,SAAS,EAAE,KAAK,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAGzD,yDAAyD;IACzD,IAAG,OAAO,EAAE;QACR,cAAc,CAAC,SAAS,EAAE,YAAY,EAAE,aAAa,EAAE,iBAAU,OAAO,UAAO,CAAC,CAAC;KACpF;IACD,cAAc,CAAC,SAAS,EAAE,eAAe,EAAE,aAAa,EAAE,oBAAoB,CAAC,CAAC;IAChF,cAAc,CAAC,SAAS,EAAE,QAAQ,EAAE,aAAa,EAAE,aAAa,CAAC,CAAC;IAElE,gCAAgC;IAChC,IAAG,OAAO,EAAE;QACR,cAAc,CAAC,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,iBAAU,OAAO,UAAO,CAAC,CAAC;KAC5E;IAED,cAAc,CAAC,SAAS,EAAE,aAAa,EAAE,OAAO,EAAE,oBAAoB,CAAC,CAAC;IACxE,cAAc,CAAC,SAAS,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,CAAC,CAAC;IAE1D,OAAO,MAAM,CAAC;AAClB,CAAC;AAGD,SAAS,cAAc,CAAC,MAAsB,EAAE,IAAY,EAAE,OAAe,EAAE,QAAgB;IAC3F,IAAI;QACA,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,UAAG,OAAO,cAAI,QAAQ,CAAE,CAAC,CAAC;KAC/C;IACD,OAAO,GAAG,EAAE;QACR,OAAO,CAAC,KAAK,CAAC,wBAAiB,OAAO,cAAI,QAAQ,eAAY,CAAC,CAAC;KACnE;AACL,CAAC","sourcesContent":["import * as nconf from 'nconf';\nimport {Provider} from 'nconf';\nimport {Config, ApplicationNameToConfigMap} from '@haventech/amorphic-contracts';\n\n\nfunction createNewNConfProvider(): Provider {\n    return new nconf.Provider().argv().env({separator: '__'});\n}\n\n/**\n * Deprecating loadFile for just 'file'\n */\nexport class SupertypeConfig implements Config {\n\n    internalConfigStore: Provider;\n    constructor() {\n        this.internalConfigStore = createNewNConfProvider();\n    }\n\n    /**\n     * Gets a value with a key\n     *\n     * @param key\n     * @returns {*}\n     */\n    get(key) {\n        return this.internalConfigStore.get(key);\n    }\n\n    /**\n     * Sets a value with a key\n     *\n     * @param key\n     * @param value\n     * @returns {*}\n     */\n    set(key, value) {\n        return this.internalConfigStore.set(key, value);\n    }\n\n    /**\n     * Load a configuration file into store\n     *\n     * @param fileKey\n     * @param file\n     */\n    loadFile(fileKey, file) {\n        this.internalConfigStore.file(fileKey, file);\n    };\n}\n\n/**\n * Same type as the AmorphicConfigBuilder build function as specified in amorphic-contracts\n * @param rootDir\n */\nexport function BuildSupertypeConfig(rootDir: string): ApplicationNameToConfigMap {\n    const rootConfig = new SupertypeConfig();\n    if (!rootDir) {\n        throw new Error(`Valid root path expected. rootDir[${rootDir}]`);\n    }\n    else {\n        const configStore: ApplicationNameToConfigMap = {};\n        let envName = rootConfig.internalConfigStore.get('APP_ENV');\n\n        if (envName) {\n            envName = envName.toLowerCase();\n        }\n\n        if (envName) {\n            loadConfigFile(rootConfig.internalConfigStore, 'root_env', rootDir, `config_${envName}.json`);\n        }\n        loadConfigFile(rootConfig.internalConfigStore, 'root_secure', rootDir, `config_secure.json`);\n        loadConfigFile(rootConfig.internalConfigStore, 'root', rootDir, `config.json`);\n\n\n        configStore['root'] = rootConfig;\n\n        const appList = rootConfig.internalConfigStore.get('applications') || {};\n\n        for (let appKey in appList) {\n            configStore[appKey] = buildAppSpecificConfigStore(appList[appKey], rootDir, envName);\n        }\n\n        return configStore;\n    }\n}\n\nfunction buildAppSpecificConfigStore(app: string, rootDir: string, envName?: string): SupertypeConfig {\n    const appPath = `${rootDir}/${app}`; // Location of the App relative to root\n    const appCommonPath = `${rootDir}/apps/common`; // Location of the common folder relative to root\n\n    const config = new SupertypeConfig();\n    const appCfgApi = config.internalConfigStore;\n\n    // Load the new app environment values into the config\n    if(envName) {\n        loadConfigFile(appCfgApi, 'app_env', appPath, `config_${envName}.json`);\n    }\n    loadConfigFile(appCfgApi, 'app_secure', appPath, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'app', appPath, `config.json`);\n\n\n    // Load the common folder configs to this config provider\n    if(envName) {\n        loadConfigFile(appCfgApi, 'common_env', appCommonPath, `config_${envName}.json`);\n    }\n    loadConfigFile(appCfgApi, 'common_secure', appCommonPath, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'common', appCommonPath, `config.json`);\n\n    // Load the root values here too\n    if(envName) {\n        loadConfigFile(appCfgApi, 'root_env', rootDir, `config_${envName}.json`);\n    }\n\n    loadConfigFile(appCfgApi, 'root_secure', rootDir, `config_secure.json`);\n    loadConfigFile(appCfgApi, 'root', rootDir, `config.json`);\n\n    return config;\n}\n\n\nfunction loadConfigFile(config: nconf.Provider, name: string, appPath: string, fileName: string) {\n    try {\n        config.file(name, `${appPath}/${fileName}`);\n    }\n    catch (err) {\n        console.debug(`Error loading ${appPath}/${fileName} to config`);\n    }\n}"]}

dist/SupertypeLogger.d.ts

@@ -0,8 +1,6 @@
+type LoggerFunction = (logLevel: string, logObject: any, ...rawLogData: any[]) => void;
 export declare class SupertypeLogger {
-    static moduleName: string;
-    private _amorphicContext;
     context: any;
     granularLevels: any;
     level: any;
-    private _clientLogger;
     constructor();
@@ -15,11 +13,8 @@ fatal(...data: any[]): void;
     trace(...data: any[]): void;
-    get clientLogger(): any;
     /**
      * assign a custom send to log functionality.
-     * @param logger - logger must fit the format of info/error/debug/warn
+     * @param {(level: string, data: any) => void} loggerFunction
      */
-    setLogger(logger: any): void;
+    setLogger(loggerFunction: LoggerFunction): void;
     private log;
-    private setLogsAmorphicContext;
-    getAmorphicContext(): any;
     startContext(context: any): void;
@@ -29,5 +24,4 @@ setContextProps(context: any): {};
     clearContextProps(contextToClear: any): void;
-    createChildLogger(context: any, rootValues?: any, dataValues?: any): SupertypeLogger;
+    createChildLogger(context: any): SupertypeLogger;
     formatDateTime(date: any): string;
-    private deleteEmptyLogProperties;
     /**
@@ -45,1 +39,2 @@ * this function is designed to be replaced by the consumer of this class.
 }
+export {};

dist/SupertypeLogger.js

 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
         }
-        return t;
-    };
-    return __assign.apply(this, arguments);
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
 };
-var __spreadArrays = (this && this.__spreadArrays) || function () {
-    for (var s = 0, i = 0, il = arguments.length; i < il; i++) s += arguments[i].length;
-    for (var r = Array(s), k = 0, i = 0; i < il; i++)
-        for (var a = arguments[i], j = 0, jl = a.length; j < jl; j++, k++)
-            r[k] = a[j];
-    return r;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
@@ -24,2 +15,9 @@ exports.SupertypeLogger = void 0;
 var strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };
+function isObject(obj) {
+    return obj != null
+        && typeof (obj) === 'object'
+        && !(obj instanceof Array)
+        && !(obj instanceof Date)
+        && !(obj instanceof Error);
+}
 var SupertypeLogger = /** @class */ (function () {
@@ -30,3 +28,2 @@ // for overriding
     function SupertypeLogger() {
-        this._amorphicContext = '__amorphicContext';
         this.context = {};
@@ -41,3 +38,3 @@ this.granularLevels = {};
         }
-        this.log.apply(this, __spreadArrays([60], data));
+        this.log.apply(this, __spreadArray([60], data, false));
     };
@@ -49,3 +46,3 @@ SupertypeLogger.prototype.error = function () {
         }
-        this.log.apply(this, __spreadArrays([50], data));
+        this.log.apply(this, __spreadArray([50], data, false));
     };
@@ -57,3 +54,3 @@ SupertypeLogger.prototype.warn = function () {
         }
-        this.log.apply(this, __spreadArrays([40], data));
+        this.log.apply(this, __spreadArray([40], data, false));
     };
@@ -65,3 +62,3 @@ SupertypeLogger.prototype.info = function () {
         }
-        this.log.apply(this, __spreadArrays([30], data));
+        this.log.apply(this, __spreadArray([30], data, false));
     };
@@ -73,3 +70,3 @@ SupertypeLogger.prototype.debug = function () {
         }
-        this.log.apply(this, __spreadArrays([20], data));
+        this.log.apply(this, __spreadArray([20], data, false));
     };
@@ -81,81 +78,58 @@ SupertypeLogger.prototype.trace = function () {
         }
-        this.log.apply(this, __spreadArrays([10], data));
+        this.log.apply(this, __spreadArray([10], data, false));
     };
-    Object.defineProperty(SupertypeLogger.prototype, "clientLogger", {
-        get: function () {
-            return this._clientLogger;
-        },
-        enumerable: false,
-        configurable: true
-    });
     /**
      * assign a custom send to log functionality.
-     * @param logger - logger must fit the format of info/error/debug/warn
+     * @param {(level: string, data: any) => void} loggerFunction
      */
-    SupertypeLogger.prototype.setLogger = function (logger) {
-        if (typeof logger.info !== 'function' ||
-            typeof logger.error !== 'function' ||
-            typeof logger.debug !== 'function' ||
-            typeof logger.warn !== 'function') {
-            throw new Error('Please specify a logger with the info, error, debug, and warn functions');
-        }
-        if (typeof logger.childLogger === 'function') {
-            this._clientLogger = logger.childLogger({ error: { isHumanRelated: false } });
-            return;
-        }
-        if (typeof logger.child === 'function') {
-            this._clientLogger = logger.child();
-            return;
-        }
-        this._clientLogger = logger;
+    SupertypeLogger.prototype.setLogger = function (loggerFunction) {
+        this.sendToLog = loggerFunction;
     };
     // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)
     SupertypeLogger.prototype.log = function (level) {
-        var args = [];
+        var data = [];
         for (var _i = 1; _i < arguments.length; _i++) {
-            args[_i - 1] = arguments[_i];
+            data[_i - 1] = arguments[_i];
         }
-        var properties = args && Array.isArray(args) ? args.slice() : args;
-        if (typeof properties[0] === 'object') {
-            var logObj = properties[0];
-            if (!logObj.data) {
-                logObj.data = {};
+        var msg = '';
+        var obj = {
+            time: (new Date()).toISOString(),
+            msg: '',
+            level: 'info',
+            __amorphicContext: {}
+        };
+        var amorphicContext = {};
+        // Copy amorphic context into the data
+        for (var prop in this.context) {
+            obj[prop] = this.context[prop];
+            amorphicContext[prop] = this.context[prop];
+        }
+        obj.level = level;
+        obj.__amorphicContext = amorphicContext;
+        data.forEach(function (arg, index) {
+            if (index === 0 && isObject(arg)) {
+                for (var proper in arg) {
+                    obj[proper] = arg[proper];
+                }
             }
-            if (!logObj.context) {
-                logObj.context = {};
+            else {
+                msg += "".concat(arg, " ");
             }
-            this.setLogsAmorphicContext(logObj.context);
-            logObj['level'] = level;
-            if (this.isEnabled(levelToStr[logObj['level']], logObj)) {
-                this.sendToLog.apply(this, __spreadArrays([levelToStr[logObj['level']], logObj], properties.slice(1)));
+        });
+        if (obj.msg.length) {
+            obj.msg += ' ';
+        }
+        if (msg.length) {
+            if (obj.module && obj.activity) {
+                obj.msg += "".concat(obj.module, "[").concat(obj.activity, "] - ");
             }
-            return;
+            obj.msg += msg;
         }
-        properties['level'] = level;
-        if (this.isEnabled(levelToStr[properties['level']], properties)) {
-            this.sendToLog(levelToStr[properties['level']], properties);
+        else if (obj.module && obj.activity) {
+            obj.msg += "".concat(obj.module, "[").concat(obj.activity, "]");
         }
-        return;
-    };
-    //This method extracts sessionId from the each request's context
-    //and places it in the context.sessionId. All other context properties are 
-    //placed in context.data object.
-    SupertypeLogger.prototype.setLogsAmorphicContext = function (object) {
-        if (this.context && Object.keys(this.context).length > 0) {
-            if (!object.data) {
-                object.data = {};
-            }
-            if (typeof object.data === 'object') {
-                var sessionId = this.context.session;
-                object.data[this._amorphicContext] = __assign({}, this.context);
-                if (object.data[this._amorphicContext] && sessionId) {
-                    object.data[this._amorphicContext].session = sessionId;
-                    delete object.data[this._amorphicContext].session;
-                }
-            }
+        if (this.isEnabled(levelToStr[obj.level], obj)) {
+            this.sendToLog.apply(this, __spreadArray([levelToStr[obj.level], obj], data, false));
         }
     };
-    SupertypeLogger.prototype.getAmorphicContext = function () {
-        return { __amorphicContext: __assign({}, this.context) };
-    };
     SupertypeLogger.prototype.startContext = function (context) {
@@ -199,3 +173,3 @@ this.context = context;
     // Create a new logger and copy over it's context
-    SupertypeLogger.prototype.createChildLogger = function (context, rootValues, dataValues) {
+    SupertypeLogger.prototype.createChildLogger = function (context) {
         var child = {};
@@ -209,13 +183,2 @@ for (var prop in this) {
         }
-        if (this._clientLogger) {
-            var childLogger = void 0;
-            if (this._clientLogger.childLogger === 'function') {
-                childLogger = this._clientLogger.childLogger(rootValues, dataValues);
-                child = childLogger;
-            }
-            else if (this._clientLogger.child === 'function') {
-                childLogger = this._clientLogger.child(__assign(__assign({}, rootValues), { data: { dataValues: dataValues } }));
-                child = childLogger;
-            }
-        }
         return child; // bad practice but should fix
@@ -234,10 +197,2 @@ };
     };
-    SupertypeLogger.prototype.deleteEmptyLogProperties = function (logObject) {
-        var keys = ['context', 'data'];
-        keys.forEach(function (key) {
-            if (logObject[key] && Object.keys(logObject[key]).length < 1) {
-                delete logObject[key];
-            }
-        });
-    };
     /**
@@ -251,3 +206,2 @@ * this function is designed to be replaced by the consumer of this class.
     SupertypeLogger.prototype.sendToLog = function (logLevel, logObject) {
-        var _a, _b, _c, _d;
         var rawLogData = [];
@@ -257,35 +211,2 @@ for (var _i = 2; _i < arguments.length; _i++) {
         }
-        var functionName = this.sendToLog.name;
-        this.deleteEmptyLogProperties(logObject);
-        if (this._clientLogger) {
-            var levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;
-            switch (levelForLog) {
-                case 10:
-                case 20:
-                    (_a = this._clientLogger).debug.apply(_a, __spreadArrays([logObject], rawLogData));
-                    return;
-                case 30:
-                    (_b = this._clientLogger).info.apply(_b, __spreadArrays([logObject], rawLogData));
-                    return;
-                case 40:
-                    (_c = this._clientLogger).warn.apply(_c, __spreadArrays([logObject], rawLogData));
-                    return;
-                case 60:
-                case 50:
-                    (_d = this._clientLogger).error.apply(_d, __spreadArrays([logObject], rawLogData));
-                    return;
-                default:
-                    this._clientLogger.error({
-                        module: SupertypeLogger.moduleName,
-                        function: functionName,
-                        category: 'milestone',
-                        message: 'invalid level used',
-                        data: {
-                            logLevel: logLevel,
-                            logObject: logObject
-                        }
-                    });
-                    return;
-            }
-        }
         console.log(this.prettyPrint(logLevel, logObject)); // eslint-disable-line no-console
@@ -295,3 +216,3 @@ };
         var split = this.split(json, { time: 1, msg: 1, level: 1, name: 1 });
-        return this.formatDateTime(json.time ? new Date(json.time) : new Date()) + ': ' +
+        return this.formatDateTime(new Date(json.time)) + ': ' +
             level.toUpperCase() + ': ' +
@@ -342,6 +263,5 @@ addColonIfToken(split[1].name, ': ') +
     };
-    SupertypeLogger.moduleName = SupertypeLogger.name;
     return SupertypeLogger;
 }());
 exports.SupertypeLogger = SupertypeLogger;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeLogger.js","sourceRoot":"","sources":["../src/SupertypeLogger.ts"],"names":[],"mappings":"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","sourcesContent":["const levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };\nconst strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };\n\nexport class SupertypeLogger {\n    static moduleName: string = SupertypeLogger.name;\n    private _amorphicContext = '__amorphicContext';\n    context: any;\n    granularLevels: any;\n    level: any;\n    private _clientLogger: any;\n\n    // for overriding\n    // sendToLog: Function;\n    // formatDateTime: Function;\n\n    constructor() {\n        this.context = {};\n        this.granularLevels = {};\n        this.level = 'info';\n    }\n\n\n    fatal(...data: any[]): void {\n        this.log(60, ...data);\n    }\n\n    error(...data: any[]): void {\n        this.log(50, ...data);\n    }\n\n    warn(...data: any[]): void {\n        this.log(40, ...data);\n    }\n\n    info(...data: any[]): void {\n        this.log(30, ...data);\n    }\n\n    debug(...data: any[]): void {\n        this.log(20, ...data);\n    }\n\n    trace(...data: any[]): void {\n        this.log(10, ...data);\n    }\n\n    get clientLogger() {\n        return this._clientLogger;\n    }\n\n    /**\n     * assign a custom send to log functionality.\n     * @param logger - logger must fit the format of info/error/debug/warn\n     */\n    setLogger(logger) {\n        if (typeof logger.info !== 'function' ||\n            typeof logger.error !== 'function' ||\n            typeof logger.debug !== 'function' ||\n            typeof logger.warn !== 'function') {\n            throw new Error('Please specify a logger with the info, error, debug, and warn functions');\n        }\n        if (typeof logger.childLogger === 'function') {\n            this._clientLogger = logger.childLogger({error: {isHumanRelated: false}});\n            return;\n        }\n        if (typeof logger.child === 'function') {\n            this._clientLogger = logger.child();\n            return;\n        }\n        this._clientLogger = logger;\n    }\n\n    // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)\n    private log(level: number, ...args: any[]): void {\n        const properties: any[] = args && Array.isArray(args) ? args.slice() : args;\n\n        if (typeof properties[0] === 'object')  {\n            let logObj = properties[0];\n            if (!logObj.data) {\n                logObj.data = {};\n            }\n            if (!logObj.context) {\n                logObj.context = {};\n            }\n\n            this.setLogsAmorphicContext(logObj.context);\n\n            logObj['level'] = level;\n            if (this.isEnabled(levelToStr[logObj['level']], logObj)) {\n                this.sendToLog(levelToStr[logObj['level']], logObj, ...properties.slice(1));\n            }\n            return;\n        }\n\n        properties['level'] = level;\n        if (this.isEnabled(levelToStr[properties['level']], properties)) {\n            this.sendToLog(levelToStr[properties['level']], properties);\n        }\n        return;\n    }\n\n    //This method extracts sessionId from the each request's context\n    //and places it in the context.sessionId. All other context properties are \n    //placed in context.data object.\n    private setLogsAmorphicContext(object) {\n        if (this.context && Object.keys(this.context).length > 0) {\n            if (!object.data) {\n                object.data = {};\n            }\n            if (typeof object.data === 'object'){\n                const sessionId = this.context.session;\n                object.data[this._amorphicContext] = { ...this.context };\n                if (object.data[this._amorphicContext] && sessionId) {\n                    object.data[this._amorphicContext].session = sessionId;\n                    delete object.data[this._amorphicContext].session;\n                }\n            }\n        }\n    }\n\n    getAmorphicContext(): any {\n        return { __amorphicContext: { ...this.context } };\n    }\n\n    startContext(context) {\n        this.context = context;\n    }\n\n    // Save the properties in the context and return a new object that has the properties only so they can be cleared\n    setContextProps(context) {\n        const reverse = {};\n\n        for (const prop in context) {\n            reverse[prop] = true;\n            this.context[prop] = context[prop];\n        }\n\n        return reverse;\n    }\n    // Parse log levels such as warn.activity\n    setLevel(level) {\n        var levels = level.split(';');\n\n        for (var ix = 0; ix < levels.length; ++ix) {\n            var levela = levels[ix];\n\n            if (levela.match(/:/)) {\n                if (levels[ix].match(/(.*):(.*)/)) {\n                    this.granularLevels[RegExp.$1] = this.granularLevels[RegExp.$1] || {};\n                    this.granularLevels[RegExp.$1] = RegExp.$2;\n                }\n                else {\n                    this.level = levels[ix];\n                }\n            }\n            else {\n                this.level = levela;\n            }\n        }\n    }\n\n    // Remove any properties recorded by setContext\n    clearContextProps(contextToClear) {\n        for (const prop in contextToClear) {\n            delete this.context[prop];\n        }\n    }\n\n    // Create a new logger and copy over it's context\n    createChildLogger(context, rootValues?, dataValues?): SupertypeLogger {\n        let child: { [key: string]: any } = {};\n\n        for (let prop in this) {\n            child[prop] = this[prop];\n        }\n\n        child.context = context || {};\n\n        for (let proper in this.context) {\n            child.context[proper] = this.context[proper];\n        }\n        if (this._clientLogger) {\n            let childLogger;\n            if (this._clientLogger.childLogger === 'function') {\n                childLogger = this._clientLogger.childLogger(rootValues, dataValues);\n                child = childLogger;\n            }\n            else if (this._clientLogger.child === 'function') {\n                childLogger = this._clientLogger.child({...rootValues, data: {dataValues}});\n                child = childLogger;\n            }\n        }\n\n        return child as SupertypeLogger; // bad practice but should fix\n    }\n\n    formatDateTime(date): string {\n        return f(2, (date.getMonth() + 1), '/') + f(2, date.getDate(), '/') + f(4, date.getFullYear(), ' ') +\n            f(2, date.getHours(), ':') + f(2, date.getMinutes(), ':') + f(2, date.getSeconds(), ':') +\n            f(3, date.getMilliseconds()) + ' GMT' + (0 - date.getTimezoneOffset() / 60);\n\n        function f(z, d, s?) {\n            while (String(d).length < z) {\n                d = '0' + d;\n            }\n\n            return d + (s || '');\n        }\n    }\n\n    private deleteEmptyLogProperties(logObject: any) {\n        const keys = ['context', 'data'];\n        keys.forEach((key) => {\n            if (logObject[key] && Object.keys(logObject[key]).length < 1) {\n                delete logObject[key];\n            }\n        })\n    }\n\n    /**\n     * this function is designed to be replaced by the consumer of this class.\n     *\n     * @param logLevel - log level\n     * @param logObject - formatted log object, passed in from consumer\n     * @param rawLogData - unformatted and unprocessed version of \"logObject\" param\n     */\n    protected sendToLog(logLevel, logObject, ...rawLogData) {\n        const functionName = this.sendToLog.name;\n        this.deleteEmptyLogProperties(logObject);\n        if (this._clientLogger) {\n            let levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;\n            switch (levelForLog) {\n                case 10:\n                case 20:\n                    this._clientLogger.debug(logObject, ...rawLogData);\n                    return;\n                case 30:\n                    this._clientLogger.info(logObject, ...rawLogData);\n                    return;\n                case 40:\n                    this._clientLogger.warn(logObject, ...rawLogData);\n                    return;\n                case 60:\n                case 50:\n                    this._clientLogger.error(logObject, ...rawLogData);\n                    return;\n                default: \n                    this._clientLogger.error({\n                        module: SupertypeLogger.moduleName,\n                        function: functionName,\n                        category: 'milestone',\n                        message: 'invalid level used',\n                        data: {\n                            logLevel: logLevel,\n                            logObject: logObject\n                        }\n                    });\n                    return;\n            }\n        }\n        console.log(this.prettyPrint(logLevel, logObject));     // eslint-disable-line no-console\n    }\n\n    prettyPrint(level, json) {\n        let split = this.split(json, {time: 1, msg: 1, level: 1, name: 1});\n\n        return this.formatDateTime(json.time ? new Date(json.time) : new Date()) + ': ' +\n            level.toUpperCase() + ': ' +\n            addColonIfToken(split[1].name, ': ') +\n            addColonIfToken(split[1].msg, ': ') +\n            xy(split[0]);\n\n        function addColonIfToken (token, colonAndSpace) {\n            if (token) {\n                return token + colonAndSpace;\n            }\n\n            return '';\n        }\n\n        function xy(j) {\n            var str = '';\n            var sep = '';\n\n            for (var prop in j) {\n                str += sep + prop + '=' + JSON.stringify(j[prop]);\n                sep = ' ';\n            }\n\n            if (str.length > 0) {\n                return '(' + str + ')';\n            }\n\n            return '';\n        }\n    }\n\n    private split(json, props): any[] {\n        const a = {};\n        const b = {};\n\n        for (const prop in json) {\n            (props[prop] ? b : a)[prop] = json[prop];\n        }\n\n        return [a, b];\n    }\n\n    // Logging is enabled if either the level threshold is met or the granular level matches\n    private isEnabled(level, obj) {\n        level = strToLevel[level];\n\n        if (level >= strToLevel[this.level]) {\n            return true;\n        }\n\n        if (this.granularLevels) {\n            for (let levelr in this.granularLevels) {\n                if (obj[levelr] && obj[levelr] == this.granularLevels[levelr]) {\n                    return true;\n                }\n            }\n        }\n    }\n}"]}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"SupertypeLogger.js","sourceRoot":"","sources":["../src/SupertypeLogger.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,IAAM,UAAU,GAAG,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,CAAC;AAClG,IAAM,UAAU,GAAG,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;AAElG,SAAS,QAAQ,CAAC,GAAG;IACjB,OAAO,GAAG,IAAI,IAAI;WACX,OAAO,CAAC,GAAG,CAAC,KAAK,QAAQ;WACzB,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC;WACvB,CAAC,CAAC,GAAG,YAAY,IAAI,CAAC;WACtB,CAAC,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC;AACnC,CAAC;AAaD;IAKI,iBAAiB;IACjB,uBAAuB;IACvB,4BAA4B;IAE5B;QACI,IAAI,CAAC,OAAO,GAAG,EAAE,CAAC;QAClB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;IACxB,CAAC;IAGD,+BAAK,GAAL;QAAM,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAChB,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IAED,+BAAK,GAAL;QAAM,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAChB,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IAED,8BAAI,GAAJ;QAAK,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QACf,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IAED,8BAAI,GAAJ;QAAK,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QACf,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IACD,+BAAK,GAAL;QAAM,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAChB,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IACD,+BAAK,GAAL;QAAM,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,yBAAc;;QAChB,IAAI,CAAC,GAAG,OAAR,IAAI,iBAAK,EAAE,GAAK,IAAI,UAAE;IAC1B,CAAC;IAED;;;OAGG;IACH,mCAAS,GAAT,UAAU,cAA8B;QACpC,IAAI,CAAC,SAAS,GAAG,cAAc,CAAC;IACpC,CAAC;IAED,8GAA8G;IACtG,6BAAG,GAAX,UAAY,KAAa;QAAE,cAAc;aAAd,UAAc,EAAd,qBAAc,EAAd,IAAc;YAAd,6BAAc;;QACrC,IAAI,GAAG,GAAG,EAAE,CAAC;QACb,IAAM,GAAG,GAAc;YACnB,IAAI,EAAE,CAAC,IAAI,IAAI,EAAE,CAAC,CAAC,WAAW,EAAE;YAChC,GAAG,EAAE,EAAE;YACP,KAAK,EAAE,MAAM;YACb,iBAAiB,EAAE,EAAE;SACxB,CAAC;QAEF,IAAM,eAAe,GAAG,EAAE,CAAC;QAC3B,sCAAsC;QACtC,KAAK,IAAM,IAAI,IAAI,IAAI,CAAC,OAAO,EAAE;YAC7B,GAAG,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;YAC/B,eAAe,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC9C;QAED,GAAG,CAAC,KAAK,GAAG,KAAK,CAAC;QAClB,GAAG,CAAC,iBAAiB,GAAG,eAAe,CAAC;QAExC,IAAI,CAAC,OAAO,CAAC,UAAC,GAAG,EAAE,KAAK;YACpB,IAAI,KAAK,KAAK,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAC9B,KAAK,IAAM,MAAM,IAAI,GAAG,EAAE;oBACtB,GAAG,CAAC,MAAM,CAAC,GAAG,GAAG,CAAC,MAAM,CAAC,CAAC;iBAC7B;aACJ;iBACI;gBACD,GAAG,IAAI,UAAG,GAAG,MAAG,CAAC;aACpB;QACL,CAAC,CAAC,CAAC;QAEH,IAAI,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE;YAChB,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;SAClB;QAED,IAAI,GAAG,CAAC,MAAM,EAAE;YACZ,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE;gBAC5B,GAAG,CAAC,GAAG,IAAI,UAAG,GAAG,CAAC,MAAM,cAAI,GAAG,CAAC,QAAQ,SAAM,CAAC;aAClD;YAED,GAAG,CAAC,GAAG,IAAI,GAAG,CAAC;SAClB;aACI,IAAI,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,QAAQ,EAAE;YACjC,GAAG,CAAC,GAAG,IAAI,UAAG,GAAG,CAAC,MAAM,cAAI,GAAG,CAAC,QAAQ,MAAG,CAAC;SAC/C;QAED,IAAI,IAAI,CAAC,SAAS,CAAC,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,CAAC,EAAE;YAC5C,IAAI,CAAC,SAAS,OAAd,IAAI,iBAAW,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,GAAG,GAAK,IAAI,UAAE;SACvD;IACL,CAAC;IAED,sCAAY,GAAZ,UAAa,OAAO;QAChB,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC;IAC3B,CAAC;IAED,iHAAiH;IACjH,yCAAe,GAAf,UAAgB,OAAO;QACnB,IAAM,OAAO,GAAG,EAAE,CAAC;QAEnB,KAAK,IAAM,IAAI,IAAI,OAAO,EAAE;YACxB,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;YACrB,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC;SACtC;QAED,OAAO,OAAO,CAAC;IACnB,CAAC;IACD,yCAAyC;IACzC,kCAAQ,GAAR,UAAS,KAAK;QACV,IAAI,MAAM,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAE9B,KAAK,IAAI,EAAE,GAAG,CAAC,EAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,EAAE,EAAE,EAAE;YACvC,IAAI,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;YAExB,IAAI,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE;gBACnB,IAAI,MAAM,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,WAAW,CAAC,EAAE;oBAC/B,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC;oBACtE,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,EAAE,CAAC;iBAC9C;qBACI;oBACD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC,EAAE,CAAC,CAAC;iBAC3B;aACJ;iBACI;gBACD,IAAI,CAAC,KAAK,GAAG,MAAM,CAAC;aACvB;SACJ;IACL,CAAC;IAED,+CAA+C;IAC/C,2CAAiB,GAAjB,UAAkB,cAAc;QAC5B,KAAK,IAAM,IAAI,IAAI,cAAc,EAAE;YAC/B,OAAO,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;SAC7B;IACL,CAAC;IAED,iDAAiD;IACjD,2CAAiB,GAAjB,UAAkB,OAAO;QACrB,IAAI,KAAK,GAA2B,EAAE,CAAC;QAEvC,KAAK,IAAI,IAAI,IAAI,IAAI,EAAE;YACnB,KAAK,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;QAED,KAAK,CAAC,OAAO,GAAG,OAAO,IAAI,EAAE,CAAC;QAE9B,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,OAAO,EAAE;YAC7B,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;SAChD;QAED,OAAO,KAAwB,CAAC,CAAC,8BAA8B;IACnE,CAAC;IAED,wCAAc,GAAd,UAAe,IAAI;QACf,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,OAAO,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,EAAE,EAAE,GAAG,CAAC;YAC/F,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,UAAU,EAAE,EAAE,GAAG,CAAC;YACxF,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC,eAAe,EAAE,CAAC,GAAG,MAAM,GAAG,CAAC,CAAC,GAAG,IAAI,CAAC,iBAAiB,EAAE,GAAG,EAAE,CAAC,CAAC;QAEhF,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAE;YACf,OAAO,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;gBACzB,CAAC,GAAG,GAAG,GAAG,CAAC,CAAC;aACf;YAED,OAAO,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QACzB,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACO,mCAAS,GAAnB,UAAoB,QAAQ,EAAE,SAAS;QAAE,oBAAa;aAAb,UAAa,EAAb,qBAAa,EAAb,IAAa;YAAb,mCAAa;;QAClD,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,SAAS,CAAC,CAAC,CAAC,CAAK,iCAAiC;IAC7F,CAAC;IAED,qCAAW,GAAX,UAAY,KAAK,EAAE,IAAI;QACnB,IAAI,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAC,IAAI,EAAE,CAAC,EAAE,GAAG,EAAE,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,IAAI,EAAE,CAAC,EAAC,CAAC,CAAC;QAEnE,OAAO,IAAI,CAAC,cAAc,CAAC,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,GAAG,IAAI;YAClD,KAAK,CAAC,WAAW,EAAE,GAAG,IAAI;YAC1B,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,EAAE,IAAI,CAAC;YACpC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,IAAI,CAAC;YACnC,EAAE,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;QAEjB,SAAS,eAAe,CAAE,KAAK,EAAE,aAAa;YAC1C,IAAI,KAAK,EAAE;gBACP,OAAO,KAAK,GAAG,aAAa,CAAC;aAChC;YAED,OAAO,EAAE,CAAC;QACd,CAAC;QAED,SAAS,EAAE,CAAC,CAAC;YACT,IAAI,GAAG,GAAG,EAAE,CAAC;YACb,IAAI,GAAG,GAAG,EAAE,CAAC;YAEb,KAAK,IAAI,IAAI,IAAI,CAAC,EAAE;gBAChB,GAAG,IAAI,GAAG,GAAG,IAAI,GAAG,GAAG,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC;gBAClD,GAAG,GAAG,GAAG,CAAC;aACb;YAED,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,EAAE;gBAChB,OAAO,GAAG,GAAG,GAAG,GAAG,GAAG,CAAC;aAC1B;YAED,OAAO,EAAE,CAAC;QACd,CAAC;IACL,CAAC;IAEO,+BAAK,GAAb,UAAc,IAAI,EAAE,KAAK;QACrB,IAAM,CAAC,GAAG,EAAE,CAAC;QACb,IAAM,CAAC,GAAG,EAAE,CAAC;QAEb,KAAK,IAAM,IAAI,IAAI,IAAI,EAAE;YACrB,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5C;QAED,OAAO,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;IAClB,CAAC;IAED,wFAAwF;IAChF,mCAAS,GAAjB,UAAkB,KAAK,EAAE,GAAG;QACxB,KAAK,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC;QAE1B,IAAI,KAAK,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE;YACjC,OAAO,IAAI,CAAC;SACf;QAED,IAAI,IAAI,CAAC,cAAc,EAAE;YACrB,KAAK,IAAI,MAAM,IAAI,IAAI,CAAC,cAAc,EAAE;gBACpC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,cAAc,CAAC,MAAM,CAAC,EAAE;oBAC3D,OAAO,IAAI,CAAC;iBACf;aACJ;SACJ;IACL,CAAC;IACL,sBAAC;AAAD,CAAC,AApPD,IAoPC;AApPY,0CAAe","sourcesContent":["const levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };\nconst strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };\n\nfunction isObject(obj) {\n    return obj != null\n        && typeof (obj) === 'object'\n        && !(obj instanceof Array)\n        && !(obj instanceof Date)\n        && !(obj instanceof Error);\n}\n\ntype LoggerFunction = (logLevel: string, logObject: any, ...rawLogData) => void;\n\ntype LogObject = {\n    level: string | number;\n    time: string;\n    msg: string;\n    module?: any;\n    activity?: any;\n    __amorphicContext: any;\n};\n\nexport class SupertypeLogger {\n    context: any;\n    granularLevels: any;\n    level: any;\n\n    // for overriding\n    // sendToLog: Function;\n    // formatDateTime: Function;\n\n    constructor() {\n        this.context = {};\n        this.granularLevels = {};\n        this.level = 'info';\n    }\n\n\n    fatal(...data: any[]): void {\n        this.log(60, ...data);\n    }\n\n    error(...data: any[]): void {\n        this.log(50, ...data);\n    }\n\n    warn(...data: any[]): void {\n        this.log(40, ...data);\n    }\n\n    info(...data: any[]): void {\n        this.log(30, ...data);\n    }\n    debug(...data: any[]): void {\n        this.log(20, ...data);\n    }\n    trace(...data: any[]): void {\n        this.log(10, ...data);\n    }\n\n    /**\n     * assign a custom send to log functionality.\n     * @param {(level: string, data: any) => void} loggerFunction\n     */\n    setLogger(loggerFunction: LoggerFunction) {\n        this.sendToLog = loggerFunction;\n    }\n\n    // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)\n    private log(level: number, ...data: any[]): void {\n        let msg = '';\n        const obj: LogObject = {\n            time: (new Date()).toISOString(),\n            msg: '',\n            level: 'info', //default info\n            __amorphicContext: {}\n        };\n\n        const amorphicContext = {};\n        // Copy amorphic context into the data\n        for (const prop in this.context) {\n            obj[prop] = this.context[prop];\n            amorphicContext[prop] = this.context[prop];\n        }\n\n        obj.level = level;\n        obj.__amorphicContext = amorphicContext;\n\n        data.forEach((arg, index) => {\n            if (index === 0 && isObject(arg)) {\n                for (const proper in arg) {\n                    obj[proper] = arg[proper];\n                }\n            }\n            else {\n                msg += `${arg} `;\n            }\n        });\n\n        if (obj.msg.length) {\n            obj.msg += ' ';\n        }\n\n        if (msg.length) {\n            if (obj.module && obj.activity) {\n                obj.msg += `${obj.module}[${obj.activity}] - `;\n            }\n\n            obj.msg += msg;\n        }\n        else if (obj.module && obj.activity) {\n            obj.msg += `${obj.module}[${obj.activity}]`;\n        }\n\n        if (this.isEnabled(levelToStr[obj.level], obj)) {\n            this.sendToLog(levelToStr[obj.level], obj, ...data);\n        }\n    }\n\n    startContext(context) {\n        this.context = context;\n    }\n\n    // Save the properties in the context and return a new object that has the properties only so they can be cleared\n    setContextProps(context) {\n        const reverse = {};\n\n        for (const prop in context) {\n            reverse[prop] = true;\n            this.context[prop] = context[prop];\n        }\n\n        return reverse;\n    }\n    // Parse log levels such as warn.activity\n    setLevel(level) {\n        var levels = level.split(';');\n\n        for (var ix = 0; ix < levels.length; ++ix) {\n            var levela = levels[ix];\n\n            if (levela.match(/:/)) {\n                if (levels[ix].match(/(.*):(.*)/)) {\n                    this.granularLevels[RegExp.$1] = this.granularLevels[RegExp.$1] || {};\n                    this.granularLevels[RegExp.$1] = RegExp.$2;\n                }\n                else {\n                    this.level = levels[ix];\n                }\n            }\n            else {\n                this.level = levela;\n            }\n        }\n    }\n\n    // Remove any properties recorded by setContext\n    clearContextProps(contextToClear) {\n        for (const prop in contextToClear) {\n            delete this.context[prop];\n        }\n    }\n\n    // Create a new logger and copy over it's context\n    createChildLogger(context): SupertypeLogger {\n        let child: { [key: string]: any } = {};\n\n        for (let prop in this) {\n            child[prop] = this[prop];\n        }\n\n        child.context = context || {};\n\n        for (let proper in this.context) {\n            child.context[proper] = this.context[proper];\n        }\n\n        return child as SupertypeLogger; // bad practice but should fix\n    }\n\n    formatDateTime(date): string {\n        return f(2, (date.getMonth() + 1), '/') + f(2, date.getDate(), '/') + f(4, date.getFullYear(), ' ') +\n            f(2, date.getHours(), ':') + f(2, date.getMinutes(), ':') + f(2, date.getSeconds(), ':') +\n            f(3, date.getMilliseconds()) + ' GMT' + (0 - date.getTimezoneOffset() / 60);\n\n        function f(z, d, s?) {\n            while (String(d).length < z) {\n                d = '0' + d;\n            }\n\n            return d + (s || '');\n        }\n    }\n\n    /**\n     * this function is designed to be replaced by the consumer of this class.\n     *\n     * @param logLevel - log level\n     * @param logObject - formatted log object, passed in from consumer\n     * @param rawLogData - unformatted and unprocessed version of \"logObject\" param\n     */\n    protected sendToLog(logLevel, logObject, ...rawLogData) {\n        console.log(this.prettyPrint(logLevel, logObject));     // eslint-disable-line no-console\n    }\n\n    prettyPrint(level, json) {\n        let split = this.split(json, {time: 1, msg: 1, level: 1, name: 1});\n\n        return this.formatDateTime(new Date(json.time)) + ': ' +\n            level.toUpperCase() + ': ' +\n            addColonIfToken(split[1].name, ': ') +\n            addColonIfToken(split[1].msg, ': ') +\n            xy(split[0]);\n\n        function addColonIfToken (token, colonAndSpace) {\n            if (token) {\n                return token + colonAndSpace;\n            }\n\n            return '';\n        }\n\n        function xy(j) {\n            var str = '';\n            var sep = '';\n\n            for (var prop in j) {\n                str += sep + prop + '=' + JSON.stringify(j[prop]);\n                sep = ' ';\n            }\n\n            if (str.length > 0) {\n                return '(' + str + ')';\n            }\n\n            return '';\n        }\n    }\n\n    private split(json, props): any[] {\n        const a = {};\n        const b = {};\n\n        for (const prop in json) {\n            (props[prop] ? b : a)[prop] = json[prop];\n        }\n\n        return [a, b];\n    }\n\n    // Logging is enabled if either the level threshold is met or the granular level matches\n    private isEnabled(level, obj) {\n        level = strToLevel[level];\n\n        if (level >= strToLevel[this.level]) {\n            return true;\n        }\n\n        if (this.granularLevels) {\n            for (let levelr in this.granularLevels) {\n                if (obj[levelr] && obj[levelr] == this.granularLevels[levelr]) {\n                    return true;\n                }\n            }\n        }\n    }\n}"]}

package.json

 {
     "name": "@haventech/supertype",
     "description": "A type system for classical inheritence, mix-ins and composition.",
-    "version": "6.0.0-beta.8",
+    "version": "6.0.0-beta.n1",
     "main": "dist/index.js",
@@ -17,3 +17,3 @@ "types": "dist/index.d.ts",
         "@types/nconf": "^0.10.0",
-        "@types/node": "16.11.22",
+        "@types/node": "14.18.33",
         "chai": "4.3.6",
@@ -26,3 +26,3 @@ "eslint": "8.8.0",
         "ts-node": "10.5.0",
-        "typescript": "3.9.10"
+        "typescript": "4.9.3"
     },
@@ -29,0 +29,0 @@ "scripts": {

src/ObjectTemplate.ts

@@ -128,3 +128,2 @@ import * as serializer from './serializer';
     static amorphicStatic = ObjectTemplate;
-    private static moduleName = ObjectTemplate.name;
 
@@ -306,3 +305,2 @@ // Nconf is the SupertypeConfig object for this app, and configStore is the list of AppConfigs
     static extend(parentTemplate, name: string | CreateTypeForName, properties) {
-        const functionName = this.extend.name;
         let props;
@@ -337,8 +335,3 @@ let createProps;
                     // eslint-disable-next-line no-console
-                    this.logger.warn({
-                        module: this.moduleName,
-                        function: functionName,
-                        category: 'milestone',
-                        message: `WARN: Attempt to extend ${parentTemplate.__name__} as ${name} but ${name} was already extended from ${existingTemplate.__parent__.__name__}`
-                    });
+                    console.log(`WARN: Attempt to extend ${parentTemplate.__name__} as ${name} but ${name} was already extended from ${existingTemplate.__parent__.__name__}`);
                 }
@@ -1244,5 +1237,4 @@ }
     createTemplateNow, mixinTemplate) {
-    const moduleName = bindParams.name;
+
     function template() {
-        const functionName = template.name;
         objectTemplate.createIfNeeded(template, this);
@@ -1273,8 +1265,3 @@ let templateRef: ConstructorType = <ConstructorType><Function>template;
         } catch (e) {
-            objectTemplate.logger.error({
-                module: moduleName,
-                const: functionName,
-                category: 'milestone',
-                error: e
-            });
+            console.log(e); // eslint-disable-line no-console
         }
@@ -1281,0 +1268,0 @@

src/SupertypeLogger.ts

 const levelToStr = { 60: 'fatal', 50: 'error', 40: 'warn', 30: 'info', 20: 'debug', 10: 'trace' };
 const strToLevel = { 'fatal': 60, 'error': 50, 'warn': 40, 'info': 30, 'debug': 20, 'trace': 10 };
 
+function isObject(obj) {
+    return obj != null
+        && typeof (obj) === 'object'
+        && !(obj instanceof Array)
+        && !(obj instanceof Date)
+        && !(obj instanceof Error);
+}
+
+type LoggerFunction = (logLevel: string, logObject: any, ...rawLogData) => void;
+
+type LogObject = {
+    level: string | number;
+    time: string;
+    msg: string;
+    module?: any;
+    activity?: any;
+    __amorphicContext: any;
+};
+
 export class SupertypeLogger {
-    static moduleName: string = SupertypeLogger.name;
-    private _amorphicContext = '__amorphicContext';
     context: any;
     granularLevels: any;
     level: any;
-    private _clientLogger: any;
 
@@ -38,7 +54,5 @@ // for overriding
     }
-
     debug(...data: any[]): void {
         this.log(20, ...data);
     }
-
     trace(...data: any[]): void {
@@ -48,80 +62,61 @@ this.log(10, ...data);
 
-    get clientLogger() {
-        return this._clientLogger;
-    }
-
     /**
      * assign a custom send to log functionality.
-     * @param logger - logger must fit the format of info/error/debug/warn
+     * @param {(level: string, data: any) => void} loggerFunction
      */
-    setLogger(logger) {
-        if (typeof logger.info !== 'function' ||
-            typeof logger.error !== 'function' ||
-            typeof logger.debug !== 'function' ||
-            typeof logger.warn !== 'function') {
-            throw new Error('Please specify a logger with the info, error, debug, and warn functions');
-        }
-        if (typeof logger.childLogger === 'function') {
-            this._clientLogger = logger.childLogger({error: {isHumanRelated: false}});
-            return;
-        }
-        if (typeof logger.child === 'function') {
-            this._clientLogger = logger.child();
-            return;
-        }
-        this._clientLogger = logger;
+    setLogger(loggerFunction: LoggerFunction) {
+        this.sendToLog = loggerFunction;
     }
 
     // Log all arguments assuming the first one is level and the second one might be an object (similar to banyan)
-    private log(level: number, ...args: any[]): void {
-        const properties: any[] = args && Array.isArray(args) ? args.slice() : args;
+    private log(level: number, ...data: any[]): void {
+        let msg = '';
+        const obj: LogObject = {
+            time: (new Date()).toISOString(),
+            msg: '',
+            level: 'info', //default info
+            __amorphicContext: {}
+        };
 
-        if (typeof properties[0] === 'object')  {
-            let logObj = properties[0];
-            if (!logObj.data) {
-                logObj.data = {};
+        const amorphicContext = {};
+        // Copy amorphic context into the data
+        for (const prop in this.context) {
+            obj[prop] = this.context[prop];
+            amorphicContext[prop] = this.context[prop];
+        }
+
+        obj.level = level;
+        obj.__amorphicContext = amorphicContext;
+
+        data.forEach((arg, index) => {
+            if (index === 0 && isObject(arg)) {
+                for (const proper in arg) {
+                    obj[proper] = arg[proper];
+                }
             }
-            if (!logObj.context) {
-                logObj.context = {};
+            else {
+                msg += `${arg} `;
             }
+        });
 
-            this.setLogsAmorphicContext(logObj.context);
+        if (obj.msg.length) {
+            obj.msg += ' ';
+        }
 
-            logObj['level'] = level;
-            if (this.isEnabled(levelToStr[logObj['level']], logObj)) {
-                this.sendToLog(levelToStr[logObj['level']], logObj, ...properties.slice(1));
+        if (msg.length) {
+            if (obj.module && obj.activity) {
+                obj.msg += `${obj.module}[${obj.activity}] - `;
             }
-            return;
-        }
 
-        properties['level'] = level;
-        if (this.isEnabled(levelToStr[properties['level']], properties)) {
-            this.sendToLog(levelToStr[properties['level']], properties);
+            obj.msg += msg;
         }
-        return;
-    }
+        else if (obj.module && obj.activity) {
+            obj.msg += `${obj.module}[${obj.activity}]`;
+        }
 
-    //This method extracts sessionId from the each request's context
-    //and places it in the context.sessionId. All other context properties are 
-    //placed in context.data object.
-    private setLogsAmorphicContext(object) {
-        if (this.context && Object.keys(this.context).length > 0) {
-            if (!object.data) {
-                object.data = {};
-            }
-            if (typeof object.data === 'object'){
-                const sessionId = this.context.session;
-                object.data[this._amorphicContext] = { ...this.context };
-                if (object.data[this._amorphicContext] && sessionId) {
-                    object.data[this._amorphicContext].session = sessionId;
-                    delete object.data[this._amorphicContext].session;
-                }
-            }
+        if (this.isEnabled(levelToStr[obj.level], obj)) {
+            this.sendToLog(levelToStr[obj.level], obj, ...data);
         }
     }
 
-    getAmorphicContext(): any {
-        return { __amorphicContext: { ...this.context } };
-    }
-
     startContext(context) {
@@ -172,3 +167,3 @@ this.context = context;
     // Create a new logger and copy over it's context
-    createChildLogger(context, rootValues?, dataValues?): SupertypeLogger {
+    createChildLogger(context): SupertypeLogger {
         let child: { [key: string]: any } = {};
@@ -185,13 +180,2 @@
         }
-        if (this._clientLogger) {
-            let childLogger;
-            if (this._clientLogger.childLogger === 'function') {
-                childLogger = this._clientLogger.childLogger(rootValues, dataValues);
-                child = childLogger;
-            }
-            else if (this._clientLogger.child === 'function') {
-                childLogger = this._clientLogger.child({...rootValues, data: {dataValues}});
-                child = childLogger;
-            }
-        }
 
@@ -215,11 +199,2 @@ return child as SupertypeLogger; // bad practice but should fix
 
-    private deleteEmptyLogProperties(logObject: any) {
-        const keys = ['context', 'data'];
-        keys.forEach((key) => {
-            if (logObject[key] && Object.keys(logObject[key]).length < 1) {
-                delete logObject[key];
-            }
-        })
-    }
-
     /**
@@ -233,35 +208,2 @@ * this function is designed to be replaced by the consumer of this class.
     protected sendToLog(logLevel, logObject, ...rawLogData) {
-        const functionName = this.sendToLog.name;
-        this.deleteEmptyLogProperties(logObject);
-        if (this._clientLogger) {
-            let levelForLog = typeof logLevel === 'string' ? strToLevel[logLevel] : logLevel;
-            switch (levelForLog) {
-                case 10:
-                case 20:
-                    this._clientLogger.debug(logObject, ...rawLogData);
-                    return;
-                case 30:
-                    this._clientLogger.info(logObject, ...rawLogData);
-                    return;
-                case 40:
-                    this._clientLogger.warn(logObject, ...rawLogData);
-                    return;
-                case 60:
-                case 50:
-                    this._clientLogger.error(logObject, ...rawLogData);
-                    return;
-                default: 
-                    this._clientLogger.error({
-                        module: SupertypeLogger.moduleName,
-                        function: functionName,
-                        category: 'milestone',
-                        message: 'invalid level used',
-                        data: {
-                            logLevel: logLevel,
-                            logObject: logObject
-                        }
-                    });
-                    return;
-            }
-        }
         console.log(this.prettyPrint(logLevel, logObject));     // eslint-disable-line no-console
@@ -273,3 +215,3 @@ }
 
-        return this.formatDateTime(json.time ? new Date(json.time) : new Date()) + ': ' +
+        return this.formatDateTime(new Date(json.time)) + ': ' +
             level.toUpperCase() + ': ' +
@@ -276,0 +218,0 @@ addColonIfToken(split[1].name, ': ') +

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Number of downloads

132

increased by12.82%

Worsened metrics

Total package byte prevSize

372428

decreased by-4.17%

Lines of code

4544

decreased by-3.65%

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes