Add support for timestampFormat

package.json

@@ -45,6 +45,7 @@
   },
   "dependencies": {
     "chalk": "^4.1.2",
+    "date-fns": "^2.30.0",
     "fs-extra": "^10.0.0",
     "parse-ms": "^2.1.0",
     "safe-json-stringify": "^1.2.0",

src/Logger.spec.ts

@@ -255,6 +255,49 @@ describe('Logger', () => {
             const stamp = logger.formatTimestamp(new Date());
             expect(/\d\d:\d\d:\d\d\.\d\d\d/.exec(stamp)).to.exist;
         });
+
+        it('uses from original options', () => {
+            logger = new Logger({ timestampFormat: 'HH' });
+            expect(
+                logger.formatTimestamp(now)
+            ).to.eql('04');
+        });
+
+        it('uses from parent options', () => {
+            logger = new Logger({ timestampFormat: 'HH' });
+            logger = logger.createLogger();
+            expect(
+                logger.formatTimestamp(now)
+            ).to.eql('04');
+        });
+
+        it('uses the default when missing from options', () => {
+            logger = new Logger();
+            expect(
+                logger.formatTimestamp(now)
+            ).to.eql(timestamp);
+        });
+
+        it('uses the default when deleted from options', () => {
+            logger = new Logger({ timestampFormat: 'HH' });
+            logger['options'].timestampFormat = undefined;
+            expect(
+                logger.formatTimestamp(now)
+            ).to.eql(timestamp);
+        });
+
+        it('uses the default when deleted from logger itself', () => {
+            logger = new Logger({ timestampFormat: 'HH' });
+            logger.timestampFormat = undefined;
+            expect(
+                logger.formatTimestamp(now)
+            ).to.eql(timestamp);
+        });
+
+        it('supports the brighterscript log format', () => {
+            logger.timestampFormat = 'hh:mm:ss:SSS aa';
+            expect(logger.formatTimestamp(now)).to.eql('04:05:06:789 AM');
+        });
     });
 
     describe('emit', () => {

src/Logger.ts

@@ -1,5 +1,6 @@
 import * as safeJsonStringify from 'safe-json-stringify';
 import { serializeError } from 'serialize-error';
+import { format } from 'date-fns';
 import type { ChalkFunction } from 'chalk';
 // eslint-disable-next-line @typescript-eslint/no-require-imports
 import Chalk = require('chalk');
@@ -20,6 +21,21 @@ export class Logger {
      */
     private options: LoggerOptions;
 
+    /**
+     * The timestamp format string. Defaults to 'HH:mm:ss.SSS' (24-hour time with milliseconds)
+     *
+     * https://date-fns.org/v2.30.0/docs/format
+     */
+    public get timestampFormat(): string {
+        return this.options.timestampFormat ?? this.options.parent?.timestampFormat ?? 'HH:mm:ss.SSS';
+    }
+    public set timestampFormat(value: string | undefined) {
+        this.options.timestampFormat = value;
+    }
+
+    /**
+     * The log level of this logger. If a log level is not specified, it will inherit from the parent logger or default to 'log'
+     */
     public get logLevel(): LogLevel | LogLevelNumeric {
         return this.options.logLevel ?? this.options.parent?.logLevel ?? 'log';
     }
@@ -175,12 +191,7 @@ export class Logger {
     }
 
     public formatTimestamp(date: Date) {
-        return date.getHours().toString().padStart(2, '0') +
-            ':' +
-            date.getMinutes().toString().padStart(2, '0') +
-            ':' +
-            date.getSeconds().toString().padStart(2, '0') +
-            '.' + date.getMilliseconds().toString().padEnd(3, '0').substring(0, 3);
+        return format(date, this.timestampFormat);
     }
 
     /**
@@ -466,6 +477,12 @@ export enum LogLevelNumeric {
 export type LogLevel = 'off' | 'error' | 'warn' | 'log' | 'info' | 'debug' | 'trace';
 
 export interface LoggerOptions {
+    /**
+     * The timestamp format string. Defaults to 'HH:mm:ss.SSS' (24-hour time with milliseconds)
+     *
+     * https://date-fns.org/v2.30.0/docs/format
+     */
+    timestampFormat?: string;
     /**
      * A prefix applied to every log entry. Appears directly after the logLevel
      */