@parcel/logger 2.0.0-nightly.97 → 2.1.0

package/lib/Logger.js

@@ -7,34 +7,47 @@ exports.patchConsole = patchConsole;
 exports.unpatchConsole = unpatchConsole;
 exports.INTERNAL_ORIGINAL_CONSOLE = exports.PluginLogger = exports.default = void 0;
 
-var _events = require("@parcel/events");
+function _events() {
+  const data = require("@parcel/events");
 
-var _util = require("util");
+  _events = function () {
+    return data;
+  };
+
+  return data;
+}
+
+function _util() {
+  const data = require("util");
 
-var _diagnostic = require("@parcel/diagnostic");
+  _util = function () {
+    return data;
+  };
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+  return data;
+}
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _diagnostic() {
+  const data = require("@parcel/diagnostic");
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+  _diagnostic = function () {
+    return data;
+  };
 
-function _classPrivateFieldGet(receiver, privateMap) { var descriptor = privateMap.get(receiver); if (!descriptor) { throw new TypeError("attempted to get private field on non-instance"); } if (descriptor.get) { return descriptor.get.call(receiver); } return descriptor.value; }
+  return data;
+}
 
 class Logger {
-  constructor() {
-    _logEmitter.set(this, {
-      writable: true,
-      value: new _events.ValueEmitter()
-    });
-  }
+  #logEmitter
+  /*: ValueEmitter<LogEvent> */
+  = new (_events().ValueEmitter)();
 
   onLog(cb) {
-    return _classPrivateFieldGet(this, _logEmitter).addListener(cb);
+    return this.#logEmitter.addListener(cb);
   }
 
   verbose(diagnostic) {
-    _classPrivateFieldGet(this, _logEmitter).emit({
+    this.#logEmitter.emit({
       type: 'log',
       level: 'verbose',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -46,7 +59,7 @@ class Logger {
   }
 
   log(diagnostic) {
-    _classPrivateFieldGet(this, _logEmitter).emit({
+    this.#logEmitter.emit({
       type: 'log',
       level: 'info',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -54,7 +67,7 @@ class Logger {
   }
 
   warn(diagnostic) {
-    _classPrivateFieldGet(this, _logEmitter).emit({
+    this.#logEmitter.emit({
       type: 'log',
       level: 'warn',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -62,20 +75,19 @@ class Logger {
   }
 
   error(input, realOrigin) {
-    // $FlowFixMe origin is undefined on PluginInputDiagnostic
-    let diagnostic = (0, _diagnostic.anyToDiagnostic)(input);
+    let diagnostic = (0, _diagnostic().anyToDiagnostic)(input);
 
     if (typeof realOrigin === 'string') {
       diagnostic = Array.isArray(diagnostic) ? diagnostic.map(d => {
-        return _objectSpread({}, d, {
+        return { ...d,
           origin: realOrigin
-        });
-      }) : _objectSpread({}, diagnostic, {
+        };
+      }) : { ...diagnostic,
         origin: realOrigin
-      });
+      };
     }
 
-    _classPrivateFieldGet(this, _logEmitter).emit({
+    this.#logEmitter.emit({
       type: 'log',
       level: 'error',
       diagnostics: Array.isArray(diagnostic) ? diagnostic : [diagnostic]
@@ -83,7 +95,7 @@ class Logger {
   }
 
   progress(message) {
-    _classPrivateFieldGet(this, _logEmitter).emit({
+    this.#logEmitter.emit({
       type: 'log',
       level: 'progress',
       message
@@ -92,27 +104,30 @@ class Logger {
 
 }
 
-var _logEmitter = new WeakMap();
-
 const logger = new Logger();
 var _default = logger;
+/** @private */
+
 exports.default = _default;
 
 class PluginLogger {
-  constructor(opts) {
-    _defineProperty(this, "origin", void 0);
+  /** @private */
 
+  /** @private */
+  constructor(opts) {
     this.origin = opts.origin;
   }
+  /** @private */
+
 
   updateOrigin(diagnostic) {
     return Array.isArray(diagnostic) ? diagnostic.map(d => {
-      return _objectSpread({}, d, {
+      return { ...d,
         origin: this.origin
-      });
-    }) : _objectSpread({}, diagnostic, {
+      };
+    }) : { ...diagnostic,
       origin: this.origin
-    });
+    };
   }
 
   verbose(diagnostic) {
@@ -132,24 +147,29 @@ class PluginLogger {
   }
 
   error(input) {
-    // $FlowFixMe it should work, don't really wanna mess with the types of logger.error though...
     logger.error(input, this.origin);
   }
+  /** @private */
+
 
   progress(message) {
     logger.progress(message);
   }
 
 }
-
-exports.PluginLogger = PluginLogger;
-let consolePatched = false;
-
-const INTERNAL_ORIGINAL_CONSOLE = _objectSpread({}, console); // Patch `console` APIs within workers to forward their messages to the Logger
-// at the appropriate levels.
+/** @private */
 
 
+exports.PluginLogger = PluginLogger;
+const INTERNAL_ORIGINAL_CONSOLE = { ...console
+};
 exports.INTERNAL_ORIGINAL_CONSOLE = INTERNAL_ORIGINAL_CONSOLE;
+let consolePatched = false;
+/**
+ * Patch `console` APIs within workers to forward their messages to the Logger
+ * at the appropriate levels.
+ * @private
+ */
 
 function patchConsole() {
   // Skip if console is already patched...
@@ -181,10 +201,14 @@ function patchConsole() {
 
   consolePatched = true;
 }
+/** @private */
+
 
 function unpatchConsole() {
   // Skip if console isn't patched...
-  if (!consolePatched) return; // $FlowFixMe
+  if (!consolePatched) return;
+  /* eslint-disable no-console */
+  // $FlowFixMe
 
   console.log = INTERNAL_ORIGINAL_CONSOLE.log; // $FlowFixMe
 
@@ -195,24 +219,26 @@ function unpatchConsole() {
   console.warn = INTERNAL_ORIGINAL_CONSOLE.warn; // $FlowFixMe
 
   console.error = INTERNAL_ORIGINAL_CONSOLE.error;
+  /* eslint-enable no-console */
+
   consolePatched = false;
 }
 
 function messagesToDiagnostic(messages) {
   if (messages.length === 1 && messages[0] instanceof Error) {
     let error = messages[0];
-    let diagnostic = (0, _diagnostic.errorToDiagnostic)(error);
+    let diagnostic = (0, _diagnostic().errorToDiagnostic)(error);
 
     if (Array.isArray(diagnostic)) {
       return diagnostic.map(d => {
-        return _objectSpread({}, d, {
+        return { ...d,
           skipFormatting: true
-        });
+        };
       });
     } else {
-      return _objectSpread({}, diagnostic, {
+      return { ...diagnostic,
         skipFormatting: true
-      });
+      };
     }
   } else {
     return {
@@ -224,5 +250,5 @@ function messagesToDiagnostic(messages) {
 }
 
 function joinLogMessages(messages) {
-  return messages.map(m => typeof m === 'string' ? m : (0, _util.inspect)(m)).join(' ');
+  return messages.map(m => typeof m === 'string' ? m : (0, _util().inspect)(m)).join(' ');
 }

package/package.json

@@ -1,11 +1,15 @@
 {
   "name": "@parcel/logger",
-  "version": "2.0.0-nightly.97+a63f3fc9",
+  "version": "2.1.0",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
@@ -13,11 +17,11 @@
   "main": "lib/Logger.js",
   "source": "src/Logger.js",
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-nightly.97+a63f3fc9",
-    "@parcel/events": "2.0.0-nightly.97+a63f3fc9"
+    "@parcel/diagnostic": "^2.1.0",
+    "@parcel/events": "^2.1.0"
   },
-  "gitHead": "a63f3fc9726483219412920faeb255e035f90747"
+  "gitHead": "5a80fbe4af8797d0aab248a66f5254f42f00e83e"
 }

package/src/Logger.js

@@ -1,6 +1,10 @@
 // @flow strict-local
 
-import type {IDisposable, LogEvent} from '@parcel/types';
+import type {
+  IDisposable,
+  LogEvent,
+  PluginLogger as IPluginLogger,
+} from '@parcel/types';
 import type {
   Diagnostic,
   Diagnostifiable,
@@ -12,7 +16,7 @@ import {inspect} from 'util';
 import {errorToDiagnostic, anyToDiagnostic} from '@parcel/diagnostic';
 
 class Logger {
-  #logEmitter = new ValueEmitter<LogEvent>();
+  #logEmitter /*: ValueEmitter<LogEvent> */ = new ValueEmitter();
 
   onLog(cb: (event: LogEvent) => mixed): IDisposable {
     return this.#logEmitter.addListener(cb);
@@ -47,7 +51,6 @@ class Logger {
   }
 
   error(input: Diagnostifiable, realOrigin?: string): void {
-    // $FlowFixMe origin is undefined on PluginInputDiagnostic
     let diagnostic = anyToDiagnostic(input);
     if (typeof realOrigin === 'string') {
       diagnostic = Array.isArray(diagnostic)
@@ -76,20 +79,24 @@ class Logger {
   }
 }
 
-const logger = new Logger();
+const logger: Logger = new Logger();
 export default logger;
 
+/** @private */
 export type PluginLoggerOpts = {|
   origin: string,
 |};
 
-export class PluginLogger {
+export class PluginLogger implements IPluginLogger {
+  /** @private */
   origin: string;
 
+  /** @private */
   constructor(opts: PluginLoggerOpts) {
     this.origin = opts.origin;
   }
 
+  /** @private */
   updateOrigin(
     diagnostic: DiagnosticWithoutOrigin | Array<DiagnosticWithoutOrigin>,
   ): Diagnostic | Array<Diagnostic> {
@@ -130,20 +137,24 @@ export class PluginLogger {
       | DiagnosticWithoutOrigin
       | Array<DiagnosticWithoutOrigin>,
   ): void {
-    // $FlowFixMe it should work, don't really wanna mess with the types of logger.error though...
     logger.error(input, this.origin);
   }
 
+  /** @private */
   progress(message: string): void {
     logger.progress(message);
   }
 }
 
-let consolePatched = false;
+/** @private */
 export const INTERNAL_ORIGINAL_CONSOLE = {...console};
+let consolePatched = false;
 
-// Patch `console` APIs within workers to forward their messages to the Logger
-// at the appropriate levels.
+/**
+ * Patch `console` APIs within workers to forward their messages to the Logger
+ * at the appropriate levels.
+ * @private
+ */
 export function patchConsole() {
   // Skip if console is already patched...
   if (consolePatched) return;
@@ -174,10 +185,12 @@ export function patchConsole() {
   consolePatched = true;
 }
 
+/** @private */
 export function unpatchConsole() {
   // Skip if console isn't patched...
   if (!consolePatched) return;
 
+  /* eslint-disable no-console */
   // $FlowFixMe
   console.log = INTERNAL_ORIGINAL_CONSOLE.log;
 
@@ -193,6 +206,7 @@ export function unpatchConsole() {
   // $FlowFixMe
   console.error = INTERNAL_ORIGINAL_CONSOLE.error;
 
+  /* eslint-enable no-console */
   consolePatched = false;
 }
 

package/test/Logger.test.js

@@ -1,4 +1,4 @@
-// @flow
+// @flow strict-local
 
 import assert from 'assert';
 import sinon from 'sinon';