@travetto/log 3.0.0-rc.2 → 3.0.0-rc.20

package/README.md

@@ -1,5 +1,5 @@
 <!-- This file was generated by @travetto/doc and should not be modified directly -->
-<!-- Please modify https://github.com/travetto/travetto/tree/main/module/log/doc.ts and execute "npx trv doc" to rebuild -->
+<!-- Please modify https://github.com/travetto/travetto/tree/main/module/log/DOC.ts and execute "npx trv doc" to rebuild -->
 # Logging
 ## Logging framework that integrates at the console.log level.
 
@@ -8,95 +8,12 @@
 npm install @travetto/log
 ```
 
-This module provides logging functionality, building upon [ConsoleManager](https://github.com/travetto/travetto/tree/main/module/base/src/console.ts) in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Application phase management, environment config and common utilities for travetto applications.") module.  This is all ultimately built upon [console](https://nodejs.org/api/console.html) operations. 
-
-The supported operations are:
-   
-   *  `console.error` which logs at the `ERROR` level
-   *  `console.warn` which logs at the `WARN` level
-   *  `console.info` which logs at the `INFO` level
-   *  `console.debug` which logs at the `DEBUG` level
-   *  `console.log` which logs at the `INFO` level
-
-**Note**: All other console methods are excluded, specifically `trace`, `inspect`, `dir`, `time`/`timeEnd`
-
-## Filtering Debug
-
-The `debug` messages can be filtered using the patterns from the [debug](https://www.npmjs.com/package/debug).  You can specify wild cards to only `DEBUG` specific modules, folders or files.  You can specify multiple, and you can also add negations to exclude specific packages.
-
-**Terminal: Sample environment flags**
-```bash
-# Debug
-$ DEBUG=@app:*,-@trv:model npx trv run app
-$ DEBUG=-@trv:registry npx trv run app
-$ DEBUG=@trv:rest npx trv run app
-$ DEBUG=@trv:*,-@trv:model npx trv run app
-```
-
-**Note**: In production mode, all `console.debug` invocations are compiled away for performance/security reasons. This means that the code is actually removed, and will not execute.
-
-## How Logging is Instrumented
-
-All of the logging instrumentation occurs at transpilation time.  All `console.*` methods are replaced with a call to a globally defined variable that delegates to the [ConsoleManager](https://github.com/travetto/travetto/tree/main/module/base/src/console.ts).  This module, hooks into the [ConsoleManager](https://github.com/travetto/travetto/tree/main/module/base/src/console.ts) and receives all logging events from all files compiled by the [Compiler](https://github.com/travetto/travetto/tree/main/module/compiler#readme "Node-integration of Typescript Compiler with advanced functionality for detecting changes in classes and methods.") module.
-
-A sample of the instrumentation would be:
-
-**Code: Sample logging at various levels**
-```typescript
-export function work() {
-  console.debug('Start Work');
-
-  try {
-    1 / 0;
-  } catch (err) {
-    console.error('Divide by zero', { error: err });
-  }
-  console.debug('End Work');
-}
-```
-
-**Code: Sample After Transpilation**
-```javascript
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.work = void 0;
-function work() {
-    ᚕlg("debug", { file: ᚕsrc(__filename), line: 2, scope: "work" }, 'Start Work');
-    try {
-        1 / 0;
-    }
-    catch (err) {
-        ᚕlg("error", { file: ᚕsrc(__filename), line: 7, scope: "work" }, 'Divide by zero', { error: err });
-    }
-    ᚕlg("debug", { file: ᚕsrc(__filename), line: 9, scope: "work" }, 'End Work');
-}
-exports.work = work;
-Object.defineProperty(exports, 'ᚕtrv', { configurable: true, value: true });
-```
-
-And when in `prod` mode transforms into:
-
-**Code: Sample After Transpilation, in Prod**
-```javascript
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.work = void 0;
-function work() {
-    try {
-        1 / 0;
-    }
-    catch (err) {
-        ᚕlg("error", { file: ᚕsrc(__filename), line: 5, scope: "work" }, 'Divide by Zero', { error: err });
-    }
-}
-exports.work = work;
-Object.defineProperty(exports, 'ᚕtrv', { configurable: true, value: true });
-```
+This module provides logging functionality, building upon [ConsoleManager](https://github.com/travetto/travetto/tree/main/module/base/src/console.ts) in the [Base](https://github.com/travetto/travetto/tree/main/module/base#readme "Environment config and common utilities for travetto applications.") module.  This is all ultimately built upon [console](https://nodejs.org/api/console.html) operations. 
 
 ## Logging to External Systems
 By default the logging functionality logs messages directly to the console, relying on the `util.inspect` method, as is the standard behavior.  When building distributed systems, with multiple separate logs, it is useful to rely on structured logging for common consumption.  The framework supports logging as [JSON](https://www.json.org), which is easily consumable by services like [elasticsearch](https://elastic.co) or [AWS Cloudwatch](https://aws.amazon.com/cloudwatch/) if running as a lambda or in a docker container.  
 
-The main caveat that comes with this, is that not all objects can be converted to JSON (specifically circular dependencies, and unsupported types).  That end, the framework recommends logging with the following format, `message: string` `context: Record<string, Primitive>`.  Here context can be recursive, but the general idea is to only pass in known data structures that will not break the [JSON](https://www.json.org) production.
+The main caveat that comes with this, is that not all objects can be converted to JSON (specifically circular dependencies, and unsupported types).  That end, the framework recommends logging with the following format, `message: string`   `context: Record<string, Primitive>`.  Here context can be recursive, but the general idea is to only pass in known data structures that will not break the [JSON](https://www.json.org) production.
 
 ## Sample Output
 
@@ -119,10 +36,12 @@ The corresponding output would be
 
 **Terminal: Logging output**
 ```bash
-$ node @travetto/base/bin/main ./doc/output.ts 
+$ trv main doc/output-run.ts
 
-2022-03-14T04:00:00.618Z info  [@trv:log/doc/output:2] Hello World
-2022-03-14T04:00:00.837Z info  [@trv:log/doc/output:4] Woah! {
-2022-03-14T04:00:01.510Z info  [@trv:log/doc/output:6] Woah!
-2022-03-14T04:00:02.450Z debug [@trv:log/doc/output:8] Test
+2029-03-14T04:00:00.618Z info  [@travetto/log:doc/output.ts:2] Hello World
+2029-03-14T04:00:00.837Z info  [@travetto/log:doc/output.ts:4] Woah! {
+  a: { b: { c: { d: 10 } } }
+}
+2029-03-14T04:00:01.510Z info  [@travetto/log:doc/output.ts:6] Woah!
+2029-03-14T04:00:02.450Z debug [@travetto/log:doc/output.ts:8] Test
 ```

package/{index.ts → __index__.ts}

@@ -4,4 +4,4 @@ export * from './src/formatter/line';
 export * from './src/appender/console';
 export * from './src/appender/file';
 export * from './src/types';
-export * from './src/util';
+export * from './src/common';

package/package.json

@@ -1,14 +1,11 @@
 {
   "name": "@travetto/log",
-  "displayName": "Logging",
-  "version": "3.0.0-rc.2",
+  "version": "3.0.0-rc.20",
   "description": "Logging framework that integrates at the console.log level.",
   "keywords": [
     "typescript",
     "travetto",
-    "logging",
-    "ast-transformation",
-    "console-log"
+    "logging"
   ],
   "homepage": "https://travetto.io",
   "license": "MIT",
@@ -17,18 +14,21 @@
     "name": "Travetto Framework"
   },
   "files": [
-    "index.ts",
-    "src",
-    "support"
+    "__index__.ts",
+    "src"
   ],
-  "main": "index.ts",
+  "main": "__index__.ts",
   "repository": {
     "url": "https://github.com/travetto/travetto.git",
     "directory": "module/log"
   },
   "dependencies": {
-    "@travetto/base": "^3.0.0-rc.0",
-    "@travetto/transformer": "^3.0.0-rc.2"
+    "@travetto/config": "^3.0.0-rc.19",
+    "@travetto/di": "^3.0.0-rc.18",
+    "@travetto/terminal": "^3.0.0-rc.7"
+  },
+  "travetto": {
+    "displayName": "Logging"
   },
   "publishConfig": {
     "access": "public"

package/src/appender/console.ts

@@ -1,19 +1,10 @@
-import { LogLevel } from '@travetto/base';
-import { Appender } from '../types';
-
-/**
- * Console logging config
- */
-export interface ConsoleAppenderOpts {
-}
+import { Appender, LogEvent } from '../types';
 
 /**
  * Console.output
  */
 export class ConsoleAppender implements Appender {
-  constructor(opts: ConsoleAppenderOpts = {}) { }
-
-  append(level: LogLevel, message: string): void {
-    console![level](message);
+  append(ev: LogEvent, formatted: string): void {
+    console![ev.level](formatted);
   }
 }

package/src/appender/file.ts

@@ -1,6 +1,5 @@
 import { createWriteStream, WriteStream } from 'fs';
-import { LogLevel } from '@travetto/base';
-import { Appender } from '../types';
+import { Appender, LogEvent } from '../types';
 
 /**
  * File appender options
@@ -22,7 +21,7 @@ export class FileAppender implements Appender {
     });
   }
 
-  append(level: LogLevel, message: string): void {
-    this.stream.write(`${message}\n`);
+  append(ev: LogEvent, formatted: string): void {
+    this.stream.write(`${formatted}\n`);
   }
 }

package/src/common.ts

@@ -0,0 +1,62 @@
+import { GlobalEnv } from '@travetto/base';
+import { Config, EnvVar } from '@travetto/config';
+import { Inject, Injectable } from '@travetto/di';
+import { Ignore } from '@travetto/schema';
+import { GlobalTerminal } from '@travetto/terminal';
+
+import { ConsoleAppender } from './appender/console';
+import { FileAppender } from './appender/file';
+import { JsonFormatter } from './formatter/json';
+import { LineFormatter } from './formatter/line';
+import { Appender, Formatter, LogEvent } from './types';
+
+@Config('log')
+export class CommonLoggerConfig {
+  /** Should we enrich the console by default */
+  @EnvVar('TRV_LOG_FORMAT')
+  format: 'line' | 'json' = 'line';
+
+  /** Log file, if needed */
+  @EnvVar('TRV_LOG_FILE')
+  file?: string;
+
+  @EnvVar('TRV_LOG_PLAIN')
+  plain?: boolean;
+
+  @EnvVar('TRV_LOG_TIME')
+  time: 's' | 'ms' | string = 'ms';
+
+  @Ignore()
+  get timestamp(): 's' | 'ms' | false {
+    return (this.time ?? 'ms') === 'ms' ? 'ms' : (this.time === 's' ? 's' : false);
+  }
+
+  postConstruct(): void {
+    if (GlobalEnv.test) {
+      this.time = '';
+    }
+    this.plain ??= GlobalTerminal.colorLevel === 0;
+  }
+}
+
+@Injectable()
+export class CommonLogger {
+  #appender: Appender;
+  #formatter: Formatter;
+
+  @Inject()
+  config: CommonLoggerConfig;
+
+  postConstruct(): void {
+    this.#formatter = this.config.format === 'line' ?
+      new LineFormatter(this.config) :
+      new JsonFormatter();
+    this.#appender = this.config.file ?
+      new FileAppender({ file: this.config.file }) :
+      new ConsoleAppender();
+  }
+
+  onLog(ev: LogEvent): void {
+    this.#appender.append(ev, this.#formatter.format(ev));
+  }
+}

package/src/formatter/line.ts

@@ -1,25 +1,26 @@
-import * as util from 'util';
+import util from 'util';
 
-import { ColorUtil, EnvUtil } from '@travetto/boot';
+import { GlobalTerminal } from '@travetto/terminal';
 
 import { LogEvent, Formatter } from '../types';
 
 /**
  * Level coloring
  */
-export const STYLES = {
-  info: ColorUtil.makeColorer('white'),
-  debug: ColorUtil.makeColorer('yellow'),
-  warn: ColorUtil.makeColorer('magenta'),
-  error: ColorUtil.makeColorer('cyan', 'inverse'),
-  timestamp: ColorUtil.makeColorer('white', 'bold'),
-  location: ColorUtil.makeColorer('blue')
-};
+export const STYLES = GlobalTerminal.palette({
+  info: ['yellow', 'goldenrod'],
+  debug: ['lightGray', '#555555'],
+  warn: ['darkOrange', 'brightMagenta'],
+  error: ['darkRed', { text: 'brightCyan', inverse: true }],
+  timestamp: ['white', 'black'],
+  location: ['lightBlue', 'purple']
+});
 
 /**
  * Line formatting options
  */
 export interface LineFormatterOpts {
+  plain?: boolean;
   timestamp?: 'ms' | 's' | false;
   colorize?: boolean;
   align?: boolean;
@@ -34,10 +35,10 @@ export class LineFormatter implements Formatter {
   #opts: LineFormatterOpts;
 
   constructor(opts: LineFormatterOpts = {}) {
-    const notPlain = !EnvUtil.isTrue('TRV_LOG_PLAIN');
+    const notPlain = opts.plain !== true;
     this.#opts = {
-      colorize: notPlain && ColorUtil.colorize,
-      timestamp: notPlain ? EnvUtil.isValueOrFalse('TRV_LOG_TIME', ['s', 'ms'] as const, 'ms') : undefined,
+      colorize: notPlain,
+      timestamp: notPlain ? opts.timestamp : undefined,
       align: true, level: notPlain, location: notPlain,
       ...opts
     };
@@ -60,7 +61,7 @@ export class LineFormatter implements Formatter {
     const out = [];
 
     if (opts.timestamp) {
-      let timestamp = ev.timestamp;
+      let timestamp = ev.timestamp.toISOString();
       if (opts.timestamp === 's') {
         timestamp = timestamp.replace(/[.]\d{3}/, '');
       }
@@ -72,17 +73,17 @@ export class LineFormatter implements Formatter {
 
     if (opts.level) {
       let level: string = ev.level;
-      if (opts.colorize) {
-        level = STYLES[ev.level](ev.level);
-      }
       if (opts.align) {
-        level += ' '.repeat(5 - ev.level.length);
+        level = level.padEnd(5, ' ');
+      }
+      if (opts.colorize) {
+        level = STYLES[ev.level](level);
       }
       out.push(level);
     }
 
-    if (ev.file && opts.location) {
-      const ns = ev.category;
+    if (ev.source && opts.location) {
+      const ns = `${ev.module}:${ev.modulePath}`;
       let loc = ev.line ? `${ns}:${ev.line}` : ns;
       if (opts.colorize) {
         loc = STYLES.location(loc);

package/src/internal/types.ts

@@ -0,0 +1 @@
+export class LoggerTarget { }

package/src/service.ts

@@ -1,125 +1,42 @@
-import { EnvUtil } from '@travetto/boot';
-import { ConsoleManager, LogLevel, AppManifest, Util } from '@travetto/base';
-import { ModuleUtil } from '@travetto/boot/src/internal/module-util';
+import { ObjectUtil, ConsoleListener, ConsoleManager, ConsoleEvent } from '@travetto/base';
+import { AutoCreate, DependencyRegistry, Injectable } from '@travetto/di';
 
-import { Appender, Formatter, LogEvent, LogLevels } from './types';
-import { LineFormatter } from './formatter/line';
-import { JsonFormatter } from './formatter/json';
-import { ConsoleAppender } from './appender/console';
-import { FileAppender } from './appender/file';
-import { LogUtil } from './util';
-
-const DefaultLoggerⲐ = Symbol.for('@trv:log/default');
-
-type LineContext = { file: string, line: number, scope?: string };
+import { LogEvent, Logger } from './types';
+import { LoggerTarget } from './internal/types';
+import { CommonLogger } from './common';
 
 /**
  * Logger service
  */
-class $Logger {
-
-  /**
-   * Should we enrich the console by default
-   */
-  // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-  readonly #logFormat: 'line' | 'json' = EnvUtil.get('TRV_LOG_FORMAT', 'line') as 'line';
-
-  readonly #logFile?: string = EnvUtil.get('TRV_LOG_FILE');
+@Injectable()
+export class LogService implements ConsoleListener, AutoCreate {
 
-  /**
-   * Listeners for logging events
-   */
-  #listenerMap = new Map<string | symbol, (ev: LogEvent) => void>();
   /**
    * List of all listeners
    */
-  #listeners: ((ev: LogEvent) => void)[] = [];
-
-  /**
-   * List of logging filters
-   */
-  #filters: Partial<Record<LogLevel, (x: string) => boolean>> = {};
-  /**
-   * Which log levels to exclude
-   */
-  #exclude: Partial<Record<LogLevel, boolean>> = { debug: true };
-
-  /**
-   * Initialize
-   */
-  init(): void {
-    if (AppManifest.env.debug.status !== false) {
-      delete this.#exclude.debug;
-      const filter = LogUtil.buildFilter(AppManifest.env.debug.value ?? '@app');
-      if (filter) {
-        this.#filters.debug = filter;
-      }
-    }
-
-    if (!this.#listenerMap.get(DefaultLoggerⲐ)) {
-      // Build default formatter
-      let formatter: Formatter;
-      switch (this.#logFormat) {
-        case 'line': formatter = new LineFormatter(); break;
-        case 'json': formatter = new JsonFormatter(); break;
-      }
-      this.listenDefault(formatter, this.#logFile ? new FileAppender({ file: this.#logFile }) : undefined);
-    }
-
-    ConsoleManager.set(this, true); // Make default
-  }
-
-  /**
-   * Add log event listener
-   */
-  listen(key: string | symbol, handler: (ev: LogEvent) => void): void {
-    this.removeListener(key);
-    this.#listenerMap.set(key, handler);
-    this.#listeners.push(handler);
-  }
+  #listeners: Logger[] = [];
 
-  /**
-   * Set default listener
-   * @param formatter
-   * @param appender Defaults to console appender unless specified
-   */
-  listenDefault(formatter: Formatter, appender?: Appender): void {
-    this.listen(DefaultLoggerⲐ, LogUtil.buildListener(formatter, appender ?? new ConsoleAppender()));
-  }
-
-  /**
-   * Clear all listeners
-   */
-  removeAll(): void {
-    this.#listenerMap.clear();
-    this.#listeners = [];
-  }
+  async postConstruct(): Promise<void> {
+    const def = await DependencyRegistry.getInstance(CommonLogger);
+    this.#listeners.push(def);
 
-  /**
-   * Remove specific listener
-   */
-  removeListener(key: string | symbol): void {
-    const handler = this.#listenerMap.get(key);
-    if (handler) {
-      this.#listenerMap.delete(key);
-      this.#listeners.splice(this.#listeners.indexOf(handler), 1);
+    const loggers = DependencyRegistry.getCandidateTypes(LoggerTarget);
+    const instances = await Promise.all(loggers.map(l => DependencyRegistry.getInstance<Logger>(l.class, l.qualifier)));
+    for (const inst of instances) {
+      this.#listeners.push(inst);
     }
-  }
 
-  /**
-   * See if log level is enabled
-   */
-  enabled(level: LogLevel): boolean {
-    return !(level in this.#exclude);
+    // Take over
+    ConsoleManager.set(this, true);
   }
 
   /**
    * Endpoint for listening, endpoint registered with ConsoleManager
    */
-  onLog(level: LogLevel, { file, line, scope }: LineContext, [message, context, ...args]: [string, Record<string, unknown>, ...unknown[]]): void {
-    level = (level in LogLevels) ? level : 'info';
-
-    if (!Util.isPlainObject(context)) {
+  onLog(ev: ConsoleEvent): void {
+    // eslint-disable-next-line @typescript-eslint/consistent-type-assertions, prefer-const
+    let [message, context, ...args] = ev.args as [string, Record<string, unknown>, ...unknown[]];
+    if (!ObjectUtil.isPlainObject(context)) {
       args.unshift(context);
       context = {};
     }
@@ -129,29 +46,16 @@ class $Logger {
       message = '';
     }
 
-    const category = ModuleUtil.getId(file);
-
-    if ((level in this.#exclude) || (category && level in this.#filters && !this.#filters[level]!(category))) {
-      return;
-    }
-
     // Allow for controlled order of event properties
     const finalEvent: LogEvent = {
-      timestamp: new Date().toISOString(),
-      level,
-      file,
-      line,
-      category,
-      scope,
+      ...ev,
       message: message !== '' ? message : undefined,
       context,
       args: args.filter(x => x !== undefined)
     };
 
     for (const l of this.#listeners) {
-      l(finalEvent);
+      l.onLog(finalEvent);
     }
   }
-}
-
-export const Logger = new $Logger();
+}

package/src/types.ts

@@ -1,43 +1,8 @@
-import { LogLevel } from '@travetto/base';
-
-/**
- * Log levels, numerically
- */
-export const LogLevels = {
-  debug: 1,
-  info: 2,
-  warn: 3,
-  error: 4
-};
-
+import { ConsoleEvent } from '@travetto/base';
 /**
  * Logging event
  */
-export interface LogEvent {
-  /**
-   * Time of event, ISO 8601 timestamp
-   */
-  timestamp: string;
-  /**
-   * Log level
-   */
-  level: LogLevel;
-  /**
-   * File
-   */
-  file: string;
-  /**
-   * Line number
-   */
-  line: number;
-  /**
-   * Categorization of file into a readable name
-   */
-  category: string;
-  /**
-   * The scope of identifiers to the location of the log statement
-   */
-  scope?: string;
+export interface LogEvent extends ConsoleEvent {
   /**
    * Log message
    */
@@ -46,17 +11,13 @@ export interface LogEvent {
    * Log Message context
    */
   context?: Record<string, unknown>;
-  /**
-   * Log arguments
-   */
-  args?: unknown[];
 }
 
 /**
  * Output appender for the logger
  */
 export interface Appender {
-  append(level: LogLevel, msg: string): void;
+  append(ev: LogEvent, formatted: string): void;
 }
 
 /**
@@ -64,4 +25,11 @@ export interface Appender {
  */
 export interface Formatter {
   format(e: LogEvent): string;
+}
+
+/**
+ * @concrete ./internal/types:LoggerTarget
+ */
+export interface Logger {
+  onLog(ev: LogEvent): void;
 }

package/src/util.ts

@@ -1,76 +0,0 @@
-import { AppManifest } from '@travetto/base';
-import { LogEvent, Formatter, Appender } from './types';
-
-/**
- * Logging utilities
- */
-export class LogUtil {
-
-  /**
-   * Produce an event listener
-   */
-  static buildListener(formatter: Formatter, appender: Appender, filter?: (ev: LogEvent) => boolean): (ev: LogEvent) => void {
-    if (filter) {
-      return (ev: LogEvent) => {
-        if (filter(ev)) {
-          appender.append(ev.level, formatter.format(ev));
-        }
-      };
-    } else {
-      return (ev: LogEvent) => appender.append(ev.level, formatter.format(ev));
-    }
-  }
-
-  /**
-   * Build a filter element
-   */
-  static buildFilterPart(p: string): { key: 'exc' | 'inc', filter: string[] } {
-    const [, neg, prop] = p.match(/(-|[+])?(.*)/)!;
-    const cleaned = (/^.*:[^\/]*[^*]$/.test(prop) ? `${prop}/*` : prop).replace(/([\/.])/g, a => `\\${a}`);
-    const key: 'exc' | 'inc' = neg ? 'exc' : 'inc';
-    const filter: string[] = [];
-
-    // Auto wildcard for modules
-    if (cleaned.startsWith('@app')) {
-      const [, sfx] = cleaned.match(/^@app(?::(.*)?)?$/)!;
-      const sub = [...AppManifest.source.common, ...AppManifest.source.local]
-        .map(f => ['.', f, sfx ?? ''].filter(x => !!x).join('/'));
-      filter.push(...sub);
-    } else {
-      filter.push(cleaned);
-    }
-
-    return { key, filter };
-  }
-
-  /**
-   * Convert filter into test function for filtering
-   */
-  static buildFilter(v: string): ((file: string) => boolean) | undefined {
-    const config: { inc: string[], exc: string[] } = { inc: [], exc: [] };
-    const { inc, exc } = config;
-
-    for (const p of v.split(/\s*,\s*/)) {
-      const { key, filter } = this.buildFilterPart(p);
-      config[key].push(...filter);
-    }
-
-    if (inc.includes('*')) {
-      inc.splice(0, inc.length);
-    } else if (inc.length === 0 && exc.length) { // If excluding and nothing included
-      const { key, filter } = this.buildFilterPart('@app');
-      config[key].push(...filter); // Listen to src by default if not explicit
-    }
-
-    const incRe = new RegExp(`^(${inc.join('|').replace(/[.]/g, '[.]').replace(/[*]/g, '.*')})`);
-    const excRe = new RegExp(`^(${exc.join('|').replace(/[.]/g, '[.]').replace(/[*]/g, '.*')})`);
-
-    if (inc.length && exc.length) {
-      return (x: string) => incRe.test(x) && !excRe.test(x);
-    } else if (inc.length) {
-      return (x: string) => incRe.test(x);
-    } else if (exc.length) {
-      return (x: string) => !excRe.test(x);
-    }
-  }
-}

package/support/phase.init.ts

@@ -1,12 +0,0 @@
-/**
- * Initializes the logger to take over from base
- */
-export const init = {
-  key: '@trv:log/init',
-  after: ['@trv:base/init'],
-  before: ['@trv:config/init'],
-  action: async (): Promise<void> => {
-    const { Logger } = await import('../src/service');
-    Logger.init();
-  }
-};

package/support/transformer.logger.ts

@@ -1,97 +0,0 @@
-import * as ts from 'typescript';
-
-import { ConsoleManager, AppManifest } from '@travetto/base';
-import {
-  TransformerId, TransformerState, OnCall, CoreUtil, LiteralUtil,
-  OnClass, AfterClass, OnMethod, AfterMethod, AfterFunction, OnFunction
-} from '@travetto/transformer';
-
-type CustomState = TransformerState & {
-  scope: { type: 'method' | 'class' | 'function', name: string }[];
-};
-
-/**
- * Allows for removal of debug log messages depending on whether app is running
- * in prod mode.
- */
-export class LoggerTransformer {
-
-  static [TransformerId] = '@trv:log';
-
-  static initState(state: CustomState): void {
-    state.scope = state.scope ?? [];
-  }
-
-  @OnClass()
-  static onClass(state: CustomState, node: ts.ClassDeclaration): typeof node {
-    this.initState(state);
-    state.scope.push({ type: 'class', name: node.name?.text ?? 'unknown' });
-    return node;
-  }
-
-  @AfterClass()
-  static afterClass(state: CustomState, node: ts.ClassDeclaration): typeof node {
-    state.scope.pop();
-    return node;
-  }
-
-  @OnMethod()
-  static onMethod(state: CustomState, node: ts.MethodDeclaration): typeof node {
-    this.initState(state);
-    let name = 'unknown';
-    if (ts.isIdentifier(node.name)) {
-      name = node.name?.text ?? name;
-    }
-    state.scope.push({ type: 'method', name });
-    return node;
-  }
-
-  @AfterMethod()
-  static afterMethod(state: CustomState, node: ts.MethodDeclaration): typeof node {
-    state.scope.pop();
-    return node;
-  }
-
-  @OnFunction()
-  static onFunction(state: CustomState, node: ts.FunctionDeclaration | ts.FunctionExpression): typeof node {
-    this.initState(state);
-    state.scope.push({ type: 'function', name: node.name?.text ?? 'unknown' });
-    return node;
-  }
-
-  @AfterFunction()
-  static afterFunction(state: CustomState, node: ts.FunctionDeclaration | ts.FunctionExpression): typeof node {
-    state.scope.pop();
-    return node;
-  }
-
-  @OnCall()
-  static onDebugCall(state: CustomState, node: ts.CallExpression): typeof node | ts.Identifier {
-    if (!ts.isIdentifier(node.expression) || node.expression.text !== ConsoleManager.key) {
-      return node;
-    }
-    const arg = CoreUtil.getArgument(node);
-    if (arg) {
-      // Okay since we create the object ourselves in ConsoleManager
-      // eslint-disable-next-line @typescript-eslint/consistent-type-assertions
-      if (!ts.isStringLiteral(arg)) {
-        return node;
-      }
-      const level = LiteralUtil.toLiteral(arg, false);
-      if (AppManifest.prod && level === 'debug') {
-        return state.createIdentifier('undefined'); // Lose debug logging if in prod
-      } else {
-        return state.factory.updateCallExpression(node, node.expression, node.typeArguments, [
-          state.factory.createStringLiteral(level),
-          LiteralUtil.fromLiteral(state.factory, {
-            file: state.getFilenameAsSrc(),
-            line: state.source.getLineAndCharacterOfPosition(node.getStart(state.source)).line + 1,
-            scope: state.scope?.map(x => x.name).join(':'),
-          }),
-          ...node.arguments.slice(2) // Drop log level, and previous context from base/console support
-        ]);
-      }
-    }
-    return node;
-  }
-}