@atlaspack/logger 2.14.5-canary.16 → 2.14.5-canary.161

package/CHANGELOG.md

@@ -1,5 +1,88 @@
 # @atlaspack/logger
 
+## 2.14.17
+
+### Patch Changes
+
+- Updated dependencies []:
+  - @atlaspack/types-internal@2.19.1
+
+## 2.14.16
+
+### Patch Changes
+
+- Updated dependencies [[`ad26146`](https://github.com/atlassian-labs/atlaspack/commit/ad26146f13b4c1cc65d4a0f9c67060b90ef14ff3), [`f1b48e7`](https://github.com/atlassian-labs/atlaspack/commit/f1b48e7a04e005cef0f36a3e692087a9ecdb6f7a), [`7f5841c`](https://github.com/atlassian-labs/atlaspack/commit/7f5841c39df049f9546cccbeea2a7337e0337b45)]:
+  - @atlaspack/rust@3.6.0
+  - @atlaspack/types-internal@2.19.0
+
+## 2.14.15
+
+### Patch Changes
+
+- Updated dependencies [[`23d561e`](https://github.com/atlassian-labs/atlaspack/commit/23d561e51e68b0c38fd1ff4e4fb173e5e7b01cf2)]:
+  - @atlaspack/rust@3.5.0
+
+## 2.14.14
+
+### Patch Changes
+
+- [#720](https://github.com/atlassian-labs/atlaspack/pull/720) [`d2fd849`](https://github.com/atlassian-labs/atlaspack/commit/d2fd849770fe6305e9c694bd97b1bd905abd9d94) Thanks [@alshdavid](https://github.com/alshdavid)! - Migrate to TypeScript
+
+- Updated dependencies [[`d2fd849`](https://github.com/atlassian-labs/atlaspack/commit/d2fd849770fe6305e9c694bd97b1bd905abd9d94)]:
+  - @atlaspack/diagnostic@2.14.2
+  - @atlaspack/events@2.14.2
+  - @atlaspack/rust@3.4.2
+
+## 2.14.13
+
+### Patch Changes
+
+- Updated dependencies [[`becf977`](https://github.com/atlassian-labs/atlaspack/commit/becf977f625d5ee46dae3d4c679f173bf5f40cc0), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5)]:
+  - @atlaspack/rust@3.4.1
+
+## 2.14.12
+
+### Patch Changes
+
+- Updated dependencies [[`c75bf55`](https://github.com/atlassian-labs/atlaspack/commit/c75bf553fff4decc285b5fd499a275853b18f8f2)]:
+  - @atlaspack/rust@3.4.0
+
+## 2.14.11
+
+### Patch Changes
+
+- [#650](https://github.com/atlassian-labs/atlaspack/pull/650) [`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb) Thanks [@alshdavid](https://github.com/alshdavid)! - Remove package.json#exports
+
+## 2.14.10
+
+### Patch Changes
+
+- Updated dependencies [[`35fdd4b`](https://github.com/atlassian-labs/atlaspack/commit/35fdd4b52da0af20f74667f7b8adfb2f90279b7c), [`6dd4ccb`](https://github.com/atlassian-labs/atlaspack/commit/6dd4ccb753541de32322d881f973d571dd57e4ca)]:
+  - @atlaspack/rust@3.3.5
+
+## 2.14.9
+
+### Patch Changes
+
+- Updated dependencies [[`124b7ff`](https://github.com/atlassian-labs/atlaspack/commit/124b7fff44f71aac9fbad289a9a9509b3dfc9aaa), [`e052521`](https://github.com/atlassian-labs/atlaspack/commit/e0525210850ed1606146eb86991049cf567c5dec), [`15c6d70`](https://github.com/atlassian-labs/atlaspack/commit/15c6d7000bd89da876bc590aa75b17a619a41896), [`e4d966c`](https://github.com/atlassian-labs/atlaspack/commit/e4d966c3c9c4292c5013372ae65b10d19d4bacc6), [`42a775d`](https://github.com/atlassian-labs/atlaspack/commit/42a775de8eec638ad188f3271964170d8c04d84b), [`29c2f10`](https://github.com/atlassian-labs/atlaspack/commit/29c2f106de9679adfb5afa04e1910471dc65a427), [`1ef91fc`](https://github.com/atlassian-labs/atlaspack/commit/1ef91fcc863fdd2831511937083dbbc1263b3d9d)]:
+  - @atlaspack/rust@3.3.4
+
+## 2.14.8
+
+### Patch Changes
+
+- Updated dependencies [[`1ab0a27`](https://github.com/atlassian-labs/atlaspack/commit/1ab0a275aeca40350415e2b03e7440d1dddc6228), [`b8a4ae8`](https://github.com/atlassian-labs/atlaspack/commit/b8a4ae8f83dc0a83d8b145c5f729936ce52080a3)]:
+  - @atlaspack/rust@3.3.3
+
+## 2.14.7
+
+### Patch Changes
+
+- [#549](https://github.com/atlassian-labs/atlaspack/pull/549) [`556d6ab`](https://github.com/atlassian-labs/atlaspack/commit/556d6ab8ede759fa7f37fcd3f4da336ef1c55e8f) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix log file RUST_LOG levels
+
+- Updated dependencies [[`556d6ab`](https://github.com/atlassian-labs/atlaspack/commit/556d6ab8ede759fa7f37fcd3f4da336ef1c55e8f)]:
+  - @atlaspack/rust@3.3.2
+
 ## 2.14.6
 
 ### Patch Changes

package/lib/Logger.js

@@ -41,12 +41,12 @@ function _diagnostic() {
 }
 var _tracer = require("./tracer");
 class Logger {
-  #logEmitter /*: ValueEmitter<LogEvent> */ = new (_events().ValueEmitter)();
+  logEmitter = new (_events().ValueEmitter)();
   onLog(cb) {
-    return this.#logEmitter.addListener(cb);
+    return this.logEmitter.addListener(cb);
   }
   verbose(diagnostic) {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'verbose',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -56,14 +56,14 @@ class Logger {
     this.log(diagnostic);
   }
   log(diagnostic) {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'info',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
     });
   }
   warn(diagnostic) {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'warn',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -82,14 +82,14 @@ class Logger {
         origin: realOrigin
       };
     }
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'error',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
     });
   }
   progress(message) {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'progress',
       message
@@ -158,23 +158,16 @@ function patchConsole() {
   if (consolePatched) return;
 
   /* eslint-disable no-console */
-  // $FlowFixMe
   console.log = console.info = (...messages) => {
     logger.info(messagesToDiagnostic(messages));
   };
-
-  // $FlowFixMe
   console.debug = (...messages) => {
     // TODO: dedicated debug level?
     logger.verbose(messagesToDiagnostic(messages));
   };
-
-  // $FlowFixMe
   console.warn = (...messages) => {
     logger.warn(messagesToDiagnostic(messages));
   };
-
-  // $FlowFixMe
   console.error = (...messages) => {
     logger.error(messagesToDiagnostic(messages));
   };
@@ -189,19 +182,10 @@ function unpatchConsole() {
   if (!consolePatched) return;
 
   /* eslint-disable no-console */
-  // $FlowFixMe
   console.log = INTERNAL_ORIGINAL_CONSOLE.log;
-
-  // $FlowFixMe
   console.info = INTERNAL_ORIGINAL_CONSOLE.info;
-
-  // $FlowFixMe
   console.debug = INTERNAL_ORIGINAL_CONSOLE.debug;
-
-  // $FlowFixMe
   console.warn = INTERNAL_ORIGINAL_CONSOLE.warn;
-
-  // $FlowFixMe
   console.error = INTERNAL_ORIGINAL_CONSOLE.error;
 
   /* eslint-enable no-console */

package/lib/types/Logger.d.ts

@@ -0,0 +1,69 @@
+import type { IDisposable, LogEvent, PluginLogger as IPluginLogger } from '@atlaspack/types-internal';
+import type { Diagnostic, Diagnostifiable, DiagnosticWithoutOrigin } from '@atlaspack/diagnostic';
+import { ValueEmitter } from '@atlaspack/events';
+export { instrument, instrumentAsync } from './tracer';
+declare class Logger {
+    logEmitter: ValueEmitter<LogEvent>;
+    onLog(cb: (event: LogEvent) => unknown): IDisposable;
+    verbose(diagnostic: Diagnostic | Array<Diagnostic>): void;
+    info(diagnostic: Diagnostic | Array<Diagnostic>): void;
+    log(diagnostic: Diagnostic | Array<Diagnostic>): void;
+    warn(diagnostic: Diagnostic | Array<Diagnostic>): void;
+    error(input: Diagnostifiable, realOrigin?: string): void;
+    progress(message: string): void;
+}
+declare const logger: Logger;
+export default logger;
+/** @private */
+export type PluginLoggerOpts = {
+    origin: string;
+};
+export declare class PluginLogger implements IPluginLogger {
+    /** @private */
+    origin: string;
+    /** @private */
+    constructor(opts: PluginLoggerOpts);
+    /** @private */
+    updateOrigin(diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): Diagnostic | Array<Diagnostic>;
+    verbose(diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): void;
+    info(diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): void;
+    log(diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): void;
+    warn(diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): void;
+    error(input: Diagnostifiable | DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>): void;
+    /** @private */
+    progress(message: string): void;
+}
+/** @private */
+export declare const INTERNAL_ORIGINAL_CONSOLE: {
+    readonly Console: console.ConsoleConstructor;
+    readonly assert: (value: any, message?: string, ...optionalParams: any[]) => void;
+    readonly clear: () => void;
+    readonly count: (label?: string) => void;
+    readonly countReset: (label?: string) => void;
+    readonly debug: (message?: any, ...optionalParams: any[]) => void;
+    readonly dir: (obj: any, options?: import("util").InspectOptions) => void;
+    readonly dirxml: (...data: any[]) => void;
+    readonly error: (message?: any, ...optionalParams: any[]) => void;
+    readonly group: (...label: any[]) => void;
+    readonly groupCollapsed: (...label: any[]) => void;
+    readonly groupEnd: () => void;
+    readonly info: (message?: any, ...optionalParams: any[]) => void;
+    readonly log: (message?: any, ...optionalParams: any[]) => void;
+    readonly table: (tabularData: any, properties?: readonly string[]) => void;
+    readonly time: (label?: string) => void;
+    readonly timeEnd: (label?: string) => void;
+    readonly timeLog: (label?: string, ...data: any[]) => void;
+    readonly trace: (message?: any, ...optionalParams: any[]) => void;
+    readonly warn: (message?: any, ...optionalParams: any[]) => void;
+    readonly profile: (label?: string) => void;
+    readonly profileEnd: (label?: string) => void;
+    readonly timeStamp: (label?: string) => void;
+};
+/**
+ * Patch `console` APIs within workers to forward their messages to the Logger
+ * at the appropriate levels.
+ * @private
+ */
+export declare function patchConsole(): void;
+/** @private */
+export declare function unpatchConsole(): void;

package/lib/types/tracer.d.ts

@@ -0,0 +1,4 @@
+import { AtlaspackTracer } from '@atlaspack/rust';
+export declare const tracer: AtlaspackTracer;
+export declare function instrument<T>(label: string, fn: () => T): T;
+export declare function instrumentAsync<T>(label: string, fn: () => Promise<T>): Promise<T>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/logger",
-  "version": "2.14.5-canary.16+4b2b575b9",
+  "version": "2.14.5-canary.161+ee040bb64",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -10,22 +10,22 @@
     "type": "git",
     "url": "https://github.com/atlassian-labs/atlaspack.git"
   },
-  "main": "lib/Logger.js",
-  "source": "src/Logger.js",
-  "exports": {
-    ".": {
-      "@atlaspack::sources": "./src/Logger.js",
-      "default": "./lib/Logger.js"
-    }
-  },
+  "main": "./lib/Logger.js",
+  "source": "./src/Logger.ts",
+  "types": "./lib/types/Logger.d.ts",
   "engines": {
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.14.1-canary.84+4b2b575b9",
-    "@atlaspack/events": "2.14.1-canary.84+4b2b575b9",
-    "@atlaspack/rust": "3.2.1-canary.16+4b2b575b9"
+    "@atlaspack/diagnostic": "2.14.1-canary.229+ee040bb64",
+    "@atlaspack/events": "2.14.1-canary.229+ee040bb64",
+    "@atlaspack/rust": "3.2.1-canary.161+ee040bb64",
+    "@atlaspack/types-internal": "2.14.1-canary.229+ee040bb64"
   },
   "type": "commonjs",
-  "gitHead": "4b2b575b98951f2dcf0c45ed8e94359b23b43815"
+  "scripts": {
+    "check-ts": "tsc --emitDeclarationOnly --rootDir src",
+    "build:lib": "gulp build --gulpfile ../../../gulpfile.js --cwd ."
+  },
+  "gitHead": "ee040bb6428f29b57d892ddd8107e29077d08ffd"
 }

package/src/{Logger.js → Logger.ts}

@@ -1,10 +1,8 @@
-// @flow strict-local
-
 import type {
   IDisposable,
   LogEvent,
   PluginLogger as IPluginLogger,
-} from '@atlaspack/types';
+} from '@atlaspack/types-internal';
 import type {
   Diagnostic,
   Diagnostifiable,
@@ -18,14 +16,14 @@ import {errorToDiagnostic, anyToDiagnostic} from '@atlaspack/diagnostic';
 export {instrument, instrumentAsync} from './tracer';
 
 class Logger {
-  #logEmitter /*: ValueEmitter<LogEvent> */ = new ValueEmitter();
+  logEmitter: ValueEmitter<LogEvent> = new ValueEmitter();
 
-  onLog(cb: (event: LogEvent) => mixed): IDisposable {
-    return this.#logEmitter.addListener(cb);
+  onLog(cb: (event: LogEvent) => unknown): IDisposable {
+    return this.logEmitter.addListener(cb);
   }
 
   verbose(diagnostic: Diagnostic | Array<Diagnostic>): void {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'verbose',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
@@ -37,7 +35,7 @@ class Logger {
   }
 
   log(diagnostic: Diagnostic | Array<Diagnostic>): void {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'info',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
@@ -45,7 +43,7 @@ class Logger {
   }
 
   warn(diagnostic: Diagnostic | Array<Diagnostic>): void {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'warn',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
@@ -53,7 +51,7 @@ class Logger {
   }
 
   error(input: Diagnostifiable, realOrigin?: string): void {
-    let diagnostic = anyToDiagnostic(input);
+    let diagnostic = anyToDiagnostic(input) as Diagnostic | Array<Diagnostic>;
     if (typeof realOrigin === 'string') {
       diagnostic = Array.isArray(diagnostic)
         ? diagnostic.map((d) => {
@@ -65,7 +63,7 @@ class Logger {
           };
     }
 
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'error',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic],
@@ -73,7 +71,7 @@ class Logger {
   }
 
   progress(message: string): void {
-    this.#logEmitter.emit({
+    this.logEmitter.emit({
       type: 'log',
       level: 'progress',
       message,
@@ -85,9 +83,9 @@ const logger: Logger = new Logger();
 export default logger;
 
 /** @private */
-export type PluginLoggerOpts = {|
-  origin: string,
-|};
+export type PluginLoggerOpts = {
+  origin: string;
+};
 
 export class PluginLogger implements IPluginLogger {
   /** @private */
@@ -106,7 +104,7 @@ export class PluginLogger implements IPluginLogger {
       ? diagnostic.map((d) => {
           return {...d, origin: this.origin};
         })
-      : {...diagnostic, origin: this.origin};
+      : ({...diagnostic, origin: this.origin} as Diagnostic);
   }
 
   verbose(
@@ -149,7 +147,7 @@ export class PluginLogger implements IPluginLogger {
 }
 
 /** @private */
-export const INTERNAL_ORIGINAL_CONSOLE = {...console};
+export const INTERNAL_ORIGINAL_CONSOLE = {...console} as const;
 let consolePatched = false;
 
 /**
@@ -162,24 +160,20 @@ export function patchConsole() {
   if (consolePatched) return;
 
   /* eslint-disable no-console */
-  // $FlowFixMe
-  console.log = console.info = (...messages: Array<mixed>) => {
+  console.log = console.info = (...messages: Array<unknown>) => {
     logger.info(messagesToDiagnostic(messages));
   };
 
-  // $FlowFixMe
-  console.debug = (...messages: Array<mixed>) => {
+  console.debug = (...messages: Array<unknown>) => {
     // TODO: dedicated debug level?
     logger.verbose(messagesToDiagnostic(messages));
   };
 
-  // $FlowFixMe
-  console.warn = (...messages: Array<mixed>) => {
+  console.warn = (...messages: Array<unknown>) => {
     logger.warn(messagesToDiagnostic(messages));
   };
 
-  // $FlowFixMe
-  console.error = (...messages: Array<mixed>) => {
+  console.error = (...messages: Array<unknown>) => {
     logger.error(messagesToDiagnostic(messages));
   };
 
@@ -193,19 +187,14 @@ export function unpatchConsole() {
   if (!consolePatched) return;
 
   /* eslint-disable no-console */
-  // $FlowFixMe
   console.log = INTERNAL_ORIGINAL_CONSOLE.log;
 
-  // $FlowFixMe
   console.info = INTERNAL_ORIGINAL_CONSOLE.info;
 
-  // $FlowFixMe
   console.debug = INTERNAL_ORIGINAL_CONSOLE.debug;
 
-  // $FlowFixMe
   console.warn = INTERNAL_ORIGINAL_CONSOLE.warn;
 
-  // $FlowFixMe
   console.error = INTERNAL_ORIGINAL_CONSOLE.error;
 
   /* eslint-enable no-console */
@@ -213,11 +202,11 @@ export function unpatchConsole() {
 }
 
 function messagesToDiagnostic(
-  messages: Array<mixed>,
+  messages: Array<unknown>,
 ): Diagnostic | Array<Diagnostic> {
   if (messages.length === 1 && messages[0] instanceof Error) {
     let error: Error = messages[0];
-    let diagnostic = errorToDiagnostic(error);
+    let diagnostic = errorToDiagnostic(error) as Diagnostic | Array<Diagnostic>;
 
     if (Array.isArray(diagnostic)) {
       return diagnostic.map((d) => {
@@ -241,7 +230,7 @@ function messagesToDiagnostic(
   }
 }
 
-function joinLogMessages(messages: Array<mixed>): string {
+function joinLogMessages(messages: Array<unknown>): string {
   return messages
     .map((m) => (typeof m === 'string' ? m : inspect(m)))
     .join(' ');

package/src/{tracer.js → tracer.ts}

@@ -1,5 +1,3 @@
-// @flow strict-local
-
 import {AtlaspackTracer} from '@atlaspack/rust';
 
 export const tracer: AtlaspackTracer = new AtlaspackTracer();

package/test/{Logger.test.js → Logger.test.ts}

@@ -1,12 +1,10 @@
-// @flow strict-local
-
 import assert from 'assert';
 import sinon from 'sinon';
 import Logger from '../src/Logger';
 
 describe('Logger', () => {
-  let onLog;
-  let logDisposable;
+  let onLog: any;
+  let logDisposable: any;
   beforeEach(() => {
     onLog = sinon.spy();
     logDisposable = Logger.onLog(onLog);

package/tsconfig.json

@@ -0,0 +1,4 @@
+{
+  "extends": "../../../tsconfig.json",
+  "include": ["src"]
+}