typeorm 0.3.12-dev.ef64bfc → 0.3.13-dev.0619aca

package/logger/AdvancedConsoleLogger.js

@@ -2,118 +2,53 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AdvancedConsoleLogger = void 0;
 const PlatformTools_1 = require("../platform/PlatformTools");
+const AbstractLogger_1 = require("./AbstractLogger");
 /**
  * Performs logging of the events in TypeORM.
  * This version of logger uses console to log events and use syntax highlighting.
  */
-class AdvancedConsoleLogger {
-    // -------------------------------------------------------------------------
-    // Constructor
-    // -------------------------------------------------------------------------
-    constructor(options) {
-        this.options = options;
-    }
-    // -------------------------------------------------------------------------
-    // Public Methods
-    // -------------------------------------------------------------------------
-    /**
-     * Logs query and parameters used in it.
-     */
-    logQuery(query, parameters, queryRunner) {
-        if (this.options === "all" ||
-            this.options === true ||
-            (Array.isArray(this.options) &&
-                this.options.indexOf("query") !== -1)) {
-            const sql = query +
-                (parameters && parameters.length
-                    ? " -- PARAMETERS: " + this.stringifyParams(parameters)
-                    : "");
-            PlatformTools_1.PlatformTools.logInfo("query:", PlatformTools_1.PlatformTools.highlightSql(sql));
-        }
-    }
-    /**
-     * Logs query that is failed.
-     */
-    logQueryError(error, query, parameters, queryRunner) {
-        if (this.options === "all" ||
-            this.options === true ||
-            (Array.isArray(this.options) &&
-                this.options.indexOf("error") !== -1)) {
-            const sql = query +
-                (parameters && parameters.length
-                    ? " -- PARAMETERS: " + this.stringifyParams(parameters)
-                    : "");
-            PlatformTools_1.PlatformTools.logError(`query failed:`, PlatformTools_1.PlatformTools.highlightSql(sql));
-            PlatformTools_1.PlatformTools.logError(`error:`, error);
-        }
-    }
-    /**
-     * Logs query that is slow.
-     */
-    logQuerySlow(time, query, parameters, queryRunner) {
-        const sql = query +
-            (parameters && parameters.length
-                ? " -- PARAMETERS: " + this.stringifyParams(parameters)
-                : "");
-        PlatformTools_1.PlatformTools.logWarn(`query is slow:`, PlatformTools_1.PlatformTools.highlightSql(sql));
-        PlatformTools_1.PlatformTools.logWarn(`execution time:`, time);
-    }
+class AdvancedConsoleLogger extends AbstractLogger_1.AbstractLogger {
     /**
-     * Logs events from the schema build process.
+     * Write log to specific output.
      */
-    logSchemaBuild(message, queryRunner) {
-        if (this.options === "all" ||
-            (Array.isArray(this.options) &&
-                this.options.indexOf("schema") !== -1)) {
-            PlatformTools_1.PlatformTools.log(message);
-        }
-    }
-    /**
-     * Logs events from the migration run process.
-     */
-    logMigration(message, queryRunner) {
-        PlatformTools_1.PlatformTools.log(message);
-    }
-    /**
-     * Perform logging using given logger, or by default to the console.
-     * Log has its own level and message.
-     */
-    log(level, message, queryRunner) {
-        switch (level) {
-            case "log":
-                if (this.options === "all" ||
-                    (Array.isArray(this.options) &&
-                        this.options.indexOf("log") !== -1))
-                    PlatformTools_1.PlatformTools.log(message);
-                break;
-            case "info":
-                if (this.options === "all" ||
-                    (Array.isArray(this.options) &&
-                        this.options.indexOf("info") !== -1))
-                    PlatformTools_1.PlatformTools.logInfo("INFO:", message);
-                break;
-            case "warn":
-                if (this.options === "all" ||
-                    (Array.isArray(this.options) &&
-                        this.options.indexOf("warn") !== -1))
-                    console.warn(PlatformTools_1.PlatformTools.warn(message));
-                break;
-        }
-    }
-    // -------------------------------------------------------------------------
-    // Protected Methods
-    // -------------------------------------------------------------------------
-    /**
-     * Converts parameters to a string.
-     * Sometimes parameters can have circular objects and therefore we are handle this case too.
-     */
-    stringifyParams(parameters) {
-        try {
-            return JSON.stringify(parameters);
-        }
-        catch (error) {
-            // most probably circular objects in parameters
-            return parameters;
+    writeLog(level, logMessage, queryRunner) {
+        var _a;
+        const messages = this.prepareLogMessages(logMessage);
+        for (let message of messages) {
+            switch ((_a = message.type) !== null && _a !== void 0 ? _a : level) {
+                case "log":
+                case "schema-build":
+                case "migration":
+                    PlatformTools_1.PlatformTools.log(String(message.message));
+                    break;
+                case "info":
+                case "query":
+                    if (message.prefix) {
+                        PlatformTools_1.PlatformTools.logInfo(message.prefix, message.message);
+                    }
+                    else {
+                        PlatformTools_1.PlatformTools.log(String(message.message));
+                    }
+                    break;
+                case "warn":
+                case "query-slow":
+                    if (message.prefix) {
+                        PlatformTools_1.PlatformTools.logWarn(message.prefix, message.message);
+                    }
+                    else {
+                        console.warn(PlatformTools_1.PlatformTools.warn(String(message.message)));
+                    }
+                    break;
+                case "error":
+                case "query-error":
+                    if (message.prefix) {
+                        PlatformTools_1.PlatformTools.logError(message.prefix, String(message.message));
+                    }
+                    else {
+                        console.error(PlatformTools_1.PlatformTools.error(String(message.message)));
+                    }
+                    break;
+            }
         }
     }
 }

package/logger/AdvancedConsoleLogger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/logger/AdvancedConsoleLogger.ts"],"names":[],"mappings":"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","file":"AdvancedConsoleLogger.js","sourcesContent":["import { LoggerOptions } from \"./LoggerOptions\"\nimport { PlatformTools } from \"../platform/PlatformTools\"\nimport { QueryRunner } from \"../query-runner/QueryRunner\"\nimport { Logger } from \"./Logger\"\n\n/**\n * Performs logging of the events in TypeORM.\n * This version of logger uses console to log events and use syntax highlighting.\n */\nexport class AdvancedConsoleLogger implements Logger {\n    // -------------------------------------------------------------------------\n    // Constructor\n    // -------------------------------------------------------------------------\n\n    constructor(private options?: LoggerOptions) {}\n\n    // -------------------------------------------------------------------------\n    // Public Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Logs query and parameters used in it.\n     */\n    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner) {\n        if (\n            this.options === \"all\" ||\n            this.options === true ||\n            (Array.isArray(this.options) &&\n                this.options.indexOf(\"query\") !== -1)\n        ) {\n            const sql =\n                query +\n                (parameters && parameters.length\n                    ? \" -- PARAMETERS: \" + this.stringifyParams(parameters)\n                    : \"\")\n            PlatformTools.logInfo(\"query:\", PlatformTools.highlightSql(sql))\n        }\n    }\n\n    /**\n     * Logs query that is failed.\n     */\n    logQueryError(\n        error: string,\n        query: string,\n        parameters?: any[],\n        queryRunner?: QueryRunner,\n    ) {\n        if (\n            this.options === \"all\" ||\n            this.options === true ||\n            (Array.isArray(this.options) &&\n                this.options.indexOf(\"error\") !== -1)\n        ) {\n            const sql =\n                query +\n                (parameters && parameters.length\n                    ? \" -- PARAMETERS: \" + this.stringifyParams(parameters)\n                    : \"\")\n            PlatformTools.logError(\n                `query failed:`,\n                PlatformTools.highlightSql(sql),\n            )\n            PlatformTools.logError(`error:`, error)\n        }\n    }\n\n    /**\n     * Logs query that is slow.\n     */\n    logQuerySlow(\n        time: number,\n        query: string,\n        parameters?: any[],\n        queryRunner?: QueryRunner,\n    ) {\n        const sql =\n            query +\n            (parameters && parameters.length\n                ? \" -- PARAMETERS: \" + this.stringifyParams(parameters)\n                : \"\")\n        PlatformTools.logWarn(`query is slow:`, PlatformTools.highlightSql(sql))\n        PlatformTools.logWarn(`execution time:`, time)\n    }\n\n    /**\n     * Logs events from the schema build process.\n     */\n    logSchemaBuild(message: string, queryRunner?: QueryRunner) {\n        if (\n            this.options === \"all\" ||\n            (Array.isArray(this.options) &&\n                this.options.indexOf(\"schema\") !== -1)\n        ) {\n            PlatformTools.log(message)\n        }\n    }\n\n    /**\n     * Logs events from the migration run process.\n     */\n    logMigration(message: string, queryRunner?: QueryRunner) {\n        PlatformTools.log(message)\n    }\n\n    /**\n     * Perform logging using given logger, or by default to the console.\n     * Log has its own level and message.\n     */\n    log(\n        level: \"log\" | \"info\" | \"warn\",\n        message: any,\n        queryRunner?: QueryRunner,\n    ) {\n        switch (level) {\n            case \"log\":\n                if (\n                    this.options === \"all\" ||\n                    (Array.isArray(this.options) &&\n                        this.options.indexOf(\"log\") !== -1)\n                )\n                    PlatformTools.log(message)\n                break\n            case \"info\":\n                if (\n                    this.options === \"all\" ||\n                    (Array.isArray(this.options) &&\n                        this.options.indexOf(\"info\") !== -1)\n                )\n                    PlatformTools.logInfo(\"INFO:\", message)\n                break\n            case \"warn\":\n                if (\n                    this.options === \"all\" ||\n                    (Array.isArray(this.options) &&\n                        this.options.indexOf(\"warn\") !== -1)\n                )\n                    console.warn(PlatformTools.warn(message))\n                break\n        }\n    }\n\n    // -------------------------------------------------------------------------\n    // Protected Methods\n    // -------------------------------------------------------------------------\n\n    /**\n     * Converts parameters to a string.\n     * Sometimes parameters can have circular objects and therefore we are handle this case too.\n     */\n    protected stringifyParams(parameters: any[]) {\n        try {\n            return JSON.stringify(parameters)\n        } catch (error) {\n            // most probably circular objects in parameters\n            return parameters\n        }\n    }\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/logger/AdvancedConsoleLogger.ts"],"names":[],"mappings":";;;AAAA,6DAAyD;AACzD,qDAAiD;AAIjD;;;GAGG;AACH,MAAa,qBAAsB,SAAQ,+BAAc;IACrD;;OAEG;IACO,QAAQ,CACd,KAAe,EACf,UAAqC,EACrC,WAAyB;;QAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAA;QAEpD,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE;YAC1B,QAAQ,MAAA,OAAO,CAAC,IAAI,mCAAI,KAAK,EAAE;gBAC3B,KAAK,KAAK,CAAC;gBACX,KAAK,cAAc,CAAC;gBACpB,KAAK,WAAW;oBACZ,6BAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;oBAC1C,MAAK;gBAET,KAAK,MAAM,CAAC;gBACZ,KAAK,OAAO;oBACR,IAAI,OAAO,CAAC,MAAM,EAAE;wBAChB,6BAAa,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;qBACzD;yBAAM;wBACH,6BAAa,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAA;qBAC7C;oBACD,MAAK;gBAET,KAAK,MAAM,CAAC;gBACZ,KAAK,YAAY;oBACb,IAAI,OAAO,CAAC,MAAM,EAAE;wBAChB,6BAAa,CAAC,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,OAAO,CAAC,CAAA;qBACzD;yBAAM;wBACH,OAAO,CAAC,IAAI,CACR,6BAAa,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAC9C,CAAA;qBACJ;oBACD,MAAK;gBAET,KAAK,OAAO,CAAC;gBACb,KAAK,aAAa;oBACd,IAAI,OAAO,CAAC,MAAM,EAAE;wBAChB,6BAAa,CAAC,QAAQ,CAClB,OAAO,CAAC,MAAM,EACd,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAC1B,CAAA;qBACJ;yBAAM;wBACH,OAAO,CAAC,KAAK,CACT,6BAAa,CAAC,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAC/C,CAAA;qBACJ;oBACD,MAAK;aACZ;SACJ;IACL,CAAC;CACJ;AAvDD,sDAuDC","file":"AdvancedConsoleLogger.js","sourcesContent":["import { PlatformTools } from \"../platform/PlatformTools\"\nimport { AbstractLogger } from \"./AbstractLogger\"\nimport { LogLevel, LogMessage } from \"./Logger\"\nimport { QueryRunner } from \"../query-runner/QueryRunner\"\n\n/**\n * Performs logging of the events in TypeORM.\n * This version of logger uses console to log events and use syntax highlighting.\n */\nexport class AdvancedConsoleLogger extends AbstractLogger {\n    /**\n     * Write log to specific output.\n     */\n    protected writeLog(\n        level: LogLevel,\n        logMessage: LogMessage | LogMessage[],\n        queryRunner?: QueryRunner,\n    ) {\n        const messages = this.prepareLogMessages(logMessage)\n\n        for (let message of messages) {\n            switch (message.type ?? level) {\n                case \"log\":\n                case \"schema-build\":\n                case \"migration\":\n                    PlatformTools.log(String(message.message))\n                    break\n\n                case \"info\":\n                case \"query\":\n                    if (message.prefix) {\n                        PlatformTools.logInfo(message.prefix, message.message)\n                    } else {\n                        PlatformTools.log(String(message.message))\n                    }\n                    break\n\n                case \"warn\":\n                case \"query-slow\":\n                    if (message.prefix) {\n                        PlatformTools.logWarn(message.prefix, message.message)\n                    } else {\n                        console.warn(\n                            PlatformTools.warn(String(message.message)),\n                        )\n                    }\n                    break\n\n                case \"error\":\n                case \"query-error\":\n                    if (message.prefix) {\n                        PlatformTools.logError(\n                            message.prefix,\n                            String(message.message),\n                        )\n                    } else {\n                        console.error(\n                            PlatformTools.error(String(message.message)),\n                        )\n                    }\n                    break\n            }\n        }\n    }\n}\n"],"sourceRoot":".."}

package/logger/DebugLogger.d.ts

@@ -1,40 +1,20 @@
-import { Logger } from "./Logger";
+import { AbstractLogger } from "./AbstractLogger";
+import { LogLevel, LogMessage, LogMessageType } from "./Logger";
 import { QueryRunner } from "../query-runner/QueryRunner";
 /**
  * Performs logging of the events in TypeORM via debug library.
  */
-export declare class DebugLogger implements Logger {
-    private debugQueryLog;
-    private debugQueryError;
-    private debugQuerySlow;
-    private debugSchemaBuild;
-    private debugMigration;
-    private debugLog;
-    private debugInfo;
-    private debugWarn;
+export declare class DebugLogger extends AbstractLogger {
     /**
-     * Logs query and parameters used in it.
+     * Object with all debug logger.
      */
-    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): void;
+    private logger;
     /**
-     * Logs query that failed.
+     * Check is logging for level or message type is enabled.
      */
-    logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner): void;
+    protected isLogEnabledFor(type?: LogLevel | LogMessageType): boolean;
     /**
-     * Logs query that is slow.
+     * Write log to specific output.
      */
-    logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner): void;
-    /**
-     * Logs events from the schema build process.
-     */
-    logSchemaBuild(message: string, queryRunner?: QueryRunner): void;
-    /**
-     * Logs events from the migration run process.
-     */
-    logMigration(message: string, queryRunner?: QueryRunner): void;
-    /**
-     * Perform logging using given logger.
-     * Log has its own level and message.
-     */
-    log(level: "log" | "info" | "warn", message: any, queryRunner?: QueryRunner): void;
+    protected writeLog(level: LogLevel, logMessage: LogMessage | LogMessage[], queryRunner?: QueryRunner): void;
 }

package/logger/DebugLogger.js

@@ -1,95 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DebugLogger = void 0;
-const tslib_1 = require("tslib");
-const debug_1 = tslib_1.__importDefault(require("debug"));
-const PlatformTools_1 = require("../platform/PlatformTools");
+const AbstractLogger_1 = require("./AbstractLogger");
+const debug_1 = require("debug");
 /**
  * Performs logging of the events in TypeORM via debug library.
  */
-class DebugLogger {
+class DebugLogger extends AbstractLogger_1.AbstractLogger {
     constructor() {
-        this.debugQueryLog = (0, debug_1.default)("typeorm:query:log");
-        this.debugQueryError = (0, debug_1.default)("typeorm:query:error");
-        this.debugQuerySlow = (0, debug_1.default)("typeorm:query:slow");
-        this.debugSchemaBuild = (0, debug_1.default)("typeorm:schema");
-        this.debugMigration = (0, debug_1.default)("typeorm:migration");
-        this.debugLog = (0, debug_1.default)("typeorm:log");
-        this.debugInfo = (0, debug_1.default)("typeorm:info");
-        this.debugWarn = (0, debug_1.default)("typeorm:warn");
+        super(...arguments);
+        /**
+         * Object with all debug logger.
+         */
+        this.logger = {
+            log: (0, debug_1.debug)("typeorm:log"),
+            info: (0, debug_1.debug)("typeorm:info"),
+            warn: (0, debug_1.debug)("typeorm:warn"),
+            error: (0, debug_1.debug)("typeorm:error"),
+            query: (0, debug_1.debug)("typeorm:query:log"),
+            "query-error": (0, debug_1.debug)("typeorm:query:error"),
+            "query-slow": (0, debug_1.debug)("typeorm:query:slow"),
+            "schema-build": (0, debug_1.debug)("typeorm:schema"),
+            migration: (0, debug_1.debug)("typeorm:migration"),
+        };
     }
     /**
-     * Logs query and parameters used in it.
+     * Check is logging for level or message type is enabled.
      */
-    logQuery(query, parameters, queryRunner) {
-        if (this.debugQueryLog.enabled) {
-            this.debugQueryLog(PlatformTools_1.PlatformTools.highlightSql(query) + ";");
-            if (parameters && parameters.length) {
-                this.debugQueryLog("parameters:", parameters);
-            }
-        }
-    }
-    /**
-     * Logs query that failed.
-     */
-    logQueryError(error, query, parameters, queryRunner) {
-        if (this.debugQueryError.enabled) {
-            this.debugQueryError(PlatformTools_1.PlatformTools.highlightSql(query) + ";");
-            if (parameters && parameters.length) {
-                this.debugQueryError("parameters:", parameters);
-            }
-            this.debugQueryError("error: ", error);
-        }
-    }
-    /**
-     * Logs query that is slow.
-     */
-    logQuerySlow(time, query, parameters, queryRunner) {
-        if (this.debugQuerySlow.enabled) {
-            this.debugQuerySlow(PlatformTools_1.PlatformTools.highlightSql(query) + ";");
-            if (parameters && parameters.length) {
-                this.debugQuerySlow("parameters:", parameters);
-            }
-            this.debugQuerySlow("execution time:", time);
-        }
-    }
-    /**
-     * Logs events from the schema build process.
-     */
-    logSchemaBuild(message, queryRunner) {
-        if (this.debugSchemaBuild.enabled) {
-            this.debugSchemaBuild(message);
-        }
-    }
-    /**
-     * Logs events from the migration run process.
-     */
-    logMigration(message, queryRunner) {
-        if (this.debugMigration.enabled) {
-            this.debugMigration(message);
+    isLogEnabledFor(type) {
+        switch (type) {
+            case "query":
+                return this.logger["query"].enabled;
+            case "query-error":
+                return this.logger["query-error"].enabled;
+            case "query-slow":
+                return true;
+            case "schema":
+            case "schema-build":
+                return this.logger["schema-build"].enabled;
+            case "migration":
+                return this.logger["migration"].enabled;
+            case "log":
+                return this.logger["log"].enabled;
+            case "info":
+                return this.logger["info"].enabled;
+            case "warn":
+                return this.logger["warn"].enabled;
+            default:
+                return false;
         }
     }
     /**
-     * Perform logging using given logger.
-     * Log has its own level and message.
+     * Write log to specific output.
      */
-    log(level, message, queryRunner) {
-        switch (level) {
-            case "log":
-                if (this.debugLog.enabled) {
-                    this.debugLog(message);
+    writeLog(level, logMessage, queryRunner) {
+        var _a;
+        const messages = this.prepareLogMessages(logMessage, {
+            appendParameterAsComment: false,
+        });
+        for (let message of messages) {
+            const messageTypeOrLevel = (_a = message.type) !== null && _a !== void 0 ? _a : level;
+            if (messageTypeOrLevel in this.logger) {
+                if (message.prefix) {
+                    this.logger[messageTypeOrLevel](message.prefix, message.message);
                 }
-                break;
-            case "info":
-                if (this.debugInfo.enabled) {
-                    this.debugInfo(message);
+                else {
+                    this.logger[messageTypeOrLevel](message.message);
                 }
-                break;
-            case "warn":
-                if (this.debugWarn.enabled) {
-                    this.debugWarn(message);
+                if (message.parameters && message.parameters.length) {
+                    this.logger[messageTypeOrLevel]("parameters:", message.parameters);
                 }
-                break;
+            }
         }
     }
 }

package/logger/DebugLogger.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/logger/DebugLogger.ts"],"names":[],"mappings":";;;;AAAA,0DAAyB;AAGzB,6DAAyD;AAEzD;;GAEG;AACH,MAAa,WAAW;IAAxB;QACY,kBAAa,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAA;QAC1C,oBAAe,GAAG,IAAA,eAAK,EAAC,qBAAqB,CAAC,CAAA;QAC9C,mBAAc,GAAG,IAAA,eAAK,EAAC,oBAAoB,CAAC,CAAA;QAC5C,qBAAgB,GAAG,IAAA,eAAK,EAAC,gBAAgB,CAAC,CAAA;QAC1C,mBAAc,GAAG,IAAA,eAAK,EAAC,mBAAmB,CAAC,CAAA;QAE3C,aAAQ,GAAG,IAAA,eAAK,EAAC,aAAa,CAAC,CAAA;QAC/B,cAAS,GAAG,IAAA,eAAK,EAAC,cAAc,CAAC,CAAA;QACjC,cAAS,GAAG,IAAA,eAAK,EAAC,cAAc,CAAC,CAAA;IA+F7C,CAAC;IA7FG;;OAEG;IACH,QAAQ,CAAC,KAAa,EAAE,UAAkB,EAAE,WAAyB;QACjE,IAAI,IAAI,CAAC,aAAa,CAAC,OAAO,EAAE;YAC5B,IAAI,CAAC,aAAa,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;YAC3D,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,aAAa,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;aAChD;SACJ;IACL,CAAC;IAED;;OAEG;IACH,aAAa,CACT,KAAa,EACb,KAAa,EACb,UAAkB,EAClB,WAAyB;QAEzB,IAAI,IAAI,CAAC,eAAe,CAAC,OAAO,EAAE;YAC9B,IAAI,CAAC,eAAe,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;YAC7D,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,eAAe,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;aAClD;YACD,IAAI,CAAC,eAAe,CAAC,SAAS,EAAE,KAAK,CAAC,CAAA;SACzC;IACL,CAAC;IAED;;OAEG;IACH,YAAY,CACR,IAAY,EACZ,KAAa,EACb,UAAkB,EAClB,WAAyB;QAEzB,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,6BAAa,CAAC,YAAY,CAAC,KAAK,CAAC,GAAG,GAAG,CAAC,CAAA;YAC5D,IAAI,UAAU,IAAI,UAAU,CAAC,MAAM,EAAE;gBACjC,IAAI,CAAC,cAAc,CAAC,aAAa,EAAE,UAAU,CAAC,CAAA;aACjD;YACD,IAAI,CAAC,cAAc,CAAC,iBAAiB,EAAE,IAAI,CAAC,CAAA;SAC/C;IACL,CAAC;IAED;;OAEG;IACH,cAAc,CAAC,OAAe,EAAE,WAAyB;QACrD,IAAI,IAAI,CAAC,gBAAgB,CAAC,OAAO,EAAE;YAC/B,IAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAA;SACjC;IACL,CAAC;IAED;;OAEG;IACH,YAAY,CAAC,OAAe,EAAE,WAAyB;QACnD,IAAI,IAAI,CAAC,cAAc,CAAC,OAAO,EAAE;YAC7B,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAA;SAC/B;IACL,CAAC;IAED;;;OAGG;IACH,GAAG,CACC,KAA8B,EAC9B,OAAY,EACZ,WAAyB;QAEzB,QAAQ,KAAK,EAAE;YACX,KAAK,KAAK;gBACN,IAAI,IAAI,CAAC,QAAQ,CAAC,OAAO,EAAE;oBACvB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAA;iBACzB;gBACD,MAAK;YACT,KAAK,MAAM;gBACP,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;iBAC1B;gBACD,MAAK;YACT,KAAK,MAAM;gBACP,IAAI,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE;oBACxB,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAA;iBAC1B;gBACD,MAAK;SACZ;IACL,CAAC;CACJ;AAxGD,kCAwGC","file":"DebugLogger.js","sourcesContent":["import debug from \"debug\"\nimport { Logger } from \"./Logger\"\nimport { QueryRunner } from \"../query-runner/QueryRunner\"\nimport { PlatformTools } from \"../platform/PlatformTools\"\n\n/**\n * Performs logging of the events in TypeORM via debug library.\n */\nexport class DebugLogger implements Logger {\n    private debugQueryLog = debug(\"typeorm:query:log\")\n    private debugQueryError = debug(\"typeorm:query:error\")\n    private debugQuerySlow = debug(\"typeorm:query:slow\")\n    private debugSchemaBuild = debug(\"typeorm:schema\")\n    private debugMigration = debug(\"typeorm:migration\")\n\n    private debugLog = debug(\"typeorm:log\")\n    private debugInfo = debug(\"typeorm:info\")\n    private debugWarn = debug(\"typeorm:warn\")\n\n    /**\n     * Logs query and parameters used in it.\n     */\n    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner) {\n        if (this.debugQueryLog.enabled) {\n            this.debugQueryLog(PlatformTools.highlightSql(query) + \";\")\n            if (parameters && parameters.length) {\n                this.debugQueryLog(\"parameters:\", parameters)\n            }\n        }\n    }\n\n    /**\n     * Logs query that failed.\n     */\n    logQueryError(\n        error: string,\n        query: string,\n        parameters?: any[],\n        queryRunner?: QueryRunner,\n    ) {\n        if (this.debugQueryError.enabled) {\n            this.debugQueryError(PlatformTools.highlightSql(query) + \";\")\n            if (parameters && parameters.length) {\n                this.debugQueryError(\"parameters:\", parameters)\n            }\n            this.debugQueryError(\"error: \", error)\n        }\n    }\n\n    /**\n     * Logs query that is slow.\n     */\n    logQuerySlow(\n        time: number,\n        query: string,\n        parameters?: any[],\n        queryRunner?: QueryRunner,\n    ) {\n        if (this.debugQuerySlow.enabled) {\n            this.debugQuerySlow(PlatformTools.highlightSql(query) + \";\")\n            if (parameters && parameters.length) {\n                this.debugQuerySlow(\"parameters:\", parameters)\n            }\n            this.debugQuerySlow(\"execution time:\", time)\n        }\n    }\n\n    /**\n     * Logs events from the schema build process.\n     */\n    logSchemaBuild(message: string, queryRunner?: QueryRunner) {\n        if (this.debugSchemaBuild.enabled) {\n            this.debugSchemaBuild(message)\n        }\n    }\n\n    /**\n     * Logs events from the migration run process.\n     */\n    logMigration(message: string, queryRunner?: QueryRunner) {\n        if (this.debugMigration.enabled) {\n            this.debugMigration(message)\n        }\n    }\n\n    /**\n     * Perform logging using given logger.\n     * Log has its own level and message.\n     */\n    log(\n        level: \"log\" | \"info\" | \"warn\",\n        message: any,\n        queryRunner?: QueryRunner,\n    ) {\n        switch (level) {\n            case \"log\":\n                if (this.debugLog.enabled) {\n                    this.debugLog(message)\n                }\n                break\n            case \"info\":\n                if (this.debugInfo.enabled) {\n                    this.debugInfo(message)\n                }\n                break\n            case \"warn\":\n                if (this.debugWarn.enabled) {\n                    this.debugWarn(message)\n                }\n                break\n        }\n    }\n}\n"],"sourceRoot":".."}
+{"version":3,"sources":["../../src/logger/DebugLogger.ts"],"names":[],"mappings":";;;AAAA,qDAAiD;AACjD,iCAAuC;AAIvC;;GAEG;AACH,MAAa,WAAY,SAAQ,+BAAc;IAA/C;;QACI;;WAEG;QACK,WAAM,GAA6B;YACvC,GAAG,EAAE,IAAA,aAAK,EAAC,aAAa,CAAC;YACzB,IAAI,EAAE,IAAA,aAAK,EAAC,cAAc,CAAC;YAC3B,IAAI,EAAE,IAAA,aAAK,EAAC,cAAc,CAAC;YAC3B,KAAK,EAAE,IAAA,aAAK,EAAC,eAAe,CAAC;YAC7B,KAAK,EAAE,IAAA,aAAK,EAAC,mBAAmB,CAAC;YACjC,aAAa,EAAE,IAAA,aAAK,EAAC,qBAAqB,CAAC;YAC3C,YAAY,EAAE,IAAA,aAAK,EAAC,oBAAoB,CAAC;YACzC,cAAc,EAAE,IAAA,aAAK,EAAC,gBAAgB,CAAC;YACvC,SAAS,EAAE,IAAA,aAAK,EAAC,mBAAmB,CAAC;SACxC,CAAA;IAuEL,CAAC;IArEG;;OAEG;IACO,eAAe,CAAC,IAAgC;QACtD,QAAQ,IAAI,EAAE;YACV,KAAK,OAAO;gBACR,OAAO,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,OAAO,CAAA;YAEvC,KAAK,aAAa;gBACd,OAAO,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC,OAAO,CAAA;YAE7C,KAAK,YAAY;gBACb,OAAO,IAAI,CAAA;YAEf,KAAK,QAAQ,CAAC;YACd,KAAK,cAAc;gBACf,OAAO,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,CAAC,OAAO,CAAA;YAE9C,KAAK,WAAW;gBACZ,OAAO,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC,OAAO,CAAA;YAE3C,KAAK,KAAK;gBACN,OAAO,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,OAAO,CAAA;YAErC,KAAK,MAAM;gBACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAA;YAEtC,KAAK,MAAM;gBACP,OAAO,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,OAAO,CAAA;YAEtC;gBACI,OAAO,KAAK,CAAA;SACnB;IACL,CAAC;IAED;;OAEG;IACO,QAAQ,CACd,KAAe,EACf,UAAqC,EACrC,WAAyB;;QAEzB,MAAM,QAAQ,GAAG,IAAI,CAAC,kBAAkB,CAAC,UAAU,EAAE;YACjD,wBAAwB,EAAE,KAAK;SAClC,CAAC,CAAA;QAEF,KAAK,IAAI,OAAO,IAAI,QAAQ,EAAE;YAC1B,MAAM,kBAAkB,GAAG,MAAA,OAAO,CAAC,IAAI,mCAAI,KAAK,CAAA;YAEhD,IAAI,kBAAkB,IAAI,IAAI,CAAC,MAAM,EAAE;gBACnC,IAAI,OAAO,CAAC,MAAM,EAAE;oBAChB,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAC3B,OAAO,CAAC,MAAM,EACd,OAAO,CAAC,OAAO,CAClB,CAAA;iBACJ;qBAAM;oBACH,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,CAAA;iBACnD;gBAED,IAAI,OAAO,CAAC,UAAU,IAAI,OAAO,CAAC,UAAU,CAAC,MAAM,EAAE;oBACjD,IAAI,CAAC,MAAM,CAAC,kBAAkB,CAAC,CAC3B,aAAa,EACb,OAAO,CAAC,UAAU,CACrB,CAAA;iBACJ;aACJ;SACJ;IACL,CAAC;CACJ;AArFD,kCAqFC","file":"DebugLogger.js","sourcesContent":["import { AbstractLogger } from \"./AbstractLogger\"\nimport { debug, Debugger } from \"debug\"\nimport { LogLevel, LogMessage, LogMessageType } from \"./Logger\"\nimport { QueryRunner } from \"../query-runner/QueryRunner\"\n\n/**\n * Performs logging of the events in TypeORM via debug library.\n */\nexport class DebugLogger extends AbstractLogger {\n    /**\n     * Object with all debug logger.\n     */\n    private logger: Record<string, Debugger> = {\n        log: debug(\"typeorm:log\"),\n        info: debug(\"typeorm:info\"),\n        warn: debug(\"typeorm:warn\"),\n        error: debug(\"typeorm:error\"),\n        query: debug(\"typeorm:query:log\"),\n        \"query-error\": debug(\"typeorm:query:error\"),\n        \"query-slow\": debug(\"typeorm:query:slow\"),\n        \"schema-build\": debug(\"typeorm:schema\"),\n        migration: debug(\"typeorm:migration\"),\n    }\n\n    /**\n     * Check is logging for level or message type is enabled.\n     */\n    protected isLogEnabledFor(type?: LogLevel | LogMessageType) {\n        switch (type) {\n            case \"query\":\n                return this.logger[\"query\"].enabled\n\n            case \"query-error\":\n                return this.logger[\"query-error\"].enabled\n\n            case \"query-slow\":\n                return true\n\n            case \"schema\":\n            case \"schema-build\":\n                return this.logger[\"schema-build\"].enabled\n\n            case \"migration\":\n                return this.logger[\"migration\"].enabled\n\n            case \"log\":\n                return this.logger[\"log\"].enabled\n\n            case \"info\":\n                return this.logger[\"info\"].enabled\n\n            case \"warn\":\n                return this.logger[\"warn\"].enabled\n\n            default:\n                return false\n        }\n    }\n\n    /**\n     * Write log to specific output.\n     */\n    protected writeLog(\n        level: LogLevel,\n        logMessage: LogMessage | LogMessage[],\n        queryRunner?: QueryRunner,\n    ) {\n        const messages = this.prepareLogMessages(logMessage, {\n            appendParameterAsComment: false,\n        })\n\n        for (let message of messages) {\n            const messageTypeOrLevel = message.type ?? level\n\n            if (messageTypeOrLevel in this.logger) {\n                if (message.prefix) {\n                    this.logger[messageTypeOrLevel](\n                        message.prefix,\n                        message.message,\n                    )\n                } else {\n                    this.logger[messageTypeOrLevel](message.message)\n                }\n\n                if (message.parameters && message.parameters.length) {\n                    this.logger[messageTypeOrLevel](\n                        \"parameters:\",\n                        message.parameters,\n                    )\n                }\n            }\n        }\n    }\n}\n"],"sourceRoot":".."}

package/logger/FileLogger.d.ts

@@ -1,46 +1,20 @@
 import { FileLoggerOptions, LoggerOptions } from "./LoggerOptions";
+import { LogLevel, LogMessage } from "./Logger";
 import { QueryRunner } from "../query-runner/QueryRunner";
-import { Logger } from "./Logger";
+import { AbstractLogger } from "./AbstractLogger";
 /**
  * Performs logging of the events in TypeORM.
  * This version of logger logs everything into ormlogs.log file.
  */
-export declare class FileLogger implements Logger {
-    private options?;
+export declare class FileLogger extends AbstractLogger {
     private fileLoggerOptions?;
-    constructor(options?: LoggerOptions | undefined, fileLoggerOptions?: FileLoggerOptions | undefined);
+    constructor(options?: LoggerOptions, fileLoggerOptions?: FileLoggerOptions | undefined);
     /**
-     * Logs query and parameters used in it.
+     * Write log to specific output.
      */
-    logQuery(query: string, parameters?: any[], queryRunner?: QueryRunner): void;
-    /**
-     * Logs query that is failed.
-     */
-    logQueryError(error: string, query: string, parameters?: any[], queryRunner?: QueryRunner): void;
-    /**
-     * Logs query that is slow.
-     */
-    logQuerySlow(time: number, query: string, parameters?: any[], queryRunner?: QueryRunner): void;
-    /**
-     * Logs events from the schema build process.
-     */
-    logSchemaBuild(message: string, queryRunner?: QueryRunner): void;
-    /**
-     * Logs events from the migrations run process.
-     */
-    logMigration(message: string, queryRunner?: QueryRunner): void;
-    /**
-     * Perform logging using given logger, or by default to the console.
-     * Log has its own level and message.
-     */
-    log(level: "log" | "info" | "warn", message: any, queryRunner?: QueryRunner): void;
+    protected writeLog(level: LogLevel, logMessage: LogMessage | LogMessage[], queryRunner?: QueryRunner): void;
     /**
      * Writes given strings into the log file.
      */
     protected write(strings: string | string[]): void;
-    /**
-     * Converts parameters to a string.
-     * Sometimes parameters can have circular objects and therefor we are handle this case too.
-     */
-    protected stringifyParams(parameters: any[]): string | any[];
 }