@atlaspack/logger 2.14.13-unified-f165f7d09.0 → 2.14.14-typescript-08dcc1c9b.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +7 -0
- package/lib/Logger.js +1 -17
- package/package.json +10 -6
- package/src/{Logger.js → Logger.ts} +15 -26
- package/src/{tracer.js → tracer.ts} +0 -2
- package/test/{Logger.test.js → Logger.test.ts} +2 -4
- package/tsconfig.json +4 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,12 @@
|
|
|
1
1
|
# @atlaspack/logger
|
|
2
2
|
|
|
3
|
+
## 2.14.13
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [[`becf977`](https://github.com/atlassian-labs/atlaspack/commit/becf977f625d5ee46dae3d4c679f173bf5f40cc0), [`f0f7c71`](https://github.com/atlassian-labs/atlaspack/commit/f0f7c7168a1d3d18c6f30d2daed611275692b7c5)]:
|
|
8
|
+
- @atlaspack/rust@3.4.1
|
|
9
|
+
|
|
3
10
|
## 2.14.12
|
|
4
11
|
|
|
5
12
|
### Patch Changes
|
package/lib/Logger.js
CHANGED
|
@@ -41,7 +41,7 @@ function _diagnostic() {
|
|
|
41
41
|
}
|
|
42
42
|
var _tracer = require("./tracer");
|
|
43
43
|
class Logger {
|
|
44
|
-
#logEmitter
|
|
44
|
+
#logEmitter = new (_events().ValueEmitter)();
|
|
45
45
|
onLog(cb) {
|
|
46
46
|
return this.#logEmitter.addListener(cb);
|
|
47
47
|
}
|
|
@@ -158,23 +158,16 @@ function patchConsole() {
|
|
|
158
158
|
if (consolePatched) return;
|
|
159
159
|
|
|
160
160
|
/* eslint-disable no-console */
|
|
161
|
-
// $FlowFixMe
|
|
162
161
|
console.log = console.info = (...messages) => {
|
|
163
162
|
logger.info(messagesToDiagnostic(messages));
|
|
164
163
|
};
|
|
165
|
-
|
|
166
|
-
// $FlowFixMe
|
|
167
164
|
console.debug = (...messages) => {
|
|
168
165
|
// TODO: dedicated debug level?
|
|
169
166
|
logger.verbose(messagesToDiagnostic(messages));
|
|
170
167
|
};
|
|
171
|
-
|
|
172
|
-
// $FlowFixMe
|
|
173
168
|
console.warn = (...messages) => {
|
|
174
169
|
logger.warn(messagesToDiagnostic(messages));
|
|
175
170
|
};
|
|
176
|
-
|
|
177
|
-
// $FlowFixMe
|
|
178
171
|
console.error = (...messages) => {
|
|
179
172
|
logger.error(messagesToDiagnostic(messages));
|
|
180
173
|
};
|
|
@@ -189,19 +182,10 @@ function unpatchConsole() {
|
|
|
189
182
|
if (!consolePatched) return;
|
|
190
183
|
|
|
191
184
|
/* eslint-disable no-console */
|
|
192
|
-
// $FlowFixMe
|
|
193
185
|
console.log = INTERNAL_ORIGINAL_CONSOLE.log;
|
|
194
|
-
|
|
195
|
-
// $FlowFixMe
|
|
196
186
|
console.info = INTERNAL_ORIGINAL_CONSOLE.info;
|
|
197
|
-
|
|
198
|
-
// $FlowFixMe
|
|
199
187
|
console.debug = INTERNAL_ORIGINAL_CONSOLE.debug;
|
|
200
|
-
|
|
201
|
-
// $FlowFixMe
|
|
202
188
|
console.warn = INTERNAL_ORIGINAL_CONSOLE.warn;
|
|
203
|
-
|
|
204
|
-
// $FlowFixMe
|
|
205
189
|
console.error = INTERNAL_ORIGINAL_CONSOLE.error;
|
|
206
190
|
|
|
207
191
|
/* eslint-enable no-console */
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@atlaspack/logger",
|
|
3
|
-
"version": "2.14.
|
|
3
|
+
"version": "2.14.14-typescript-08dcc1c9b.0",
|
|
4
4
|
"description": "Blazing fast, zero configuration web application bundler",
|
|
5
5
|
"license": "(MIT OR Apache-2.0)",
|
|
6
6
|
"publishConfig": {
|
|
@@ -11,15 +11,19 @@
|
|
|
11
11
|
"url": "https://github.com/atlassian-labs/atlaspack.git"
|
|
12
12
|
},
|
|
13
13
|
"main": "lib/Logger.js",
|
|
14
|
-
"source": "src/Logger.
|
|
14
|
+
"source": "src/Logger.ts",
|
|
15
15
|
"engines": {
|
|
16
16
|
"node": ">= 16.0.0"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@atlaspack/diagnostic": "2.14.2-
|
|
20
|
-
"@atlaspack/events": "2.14.2-
|
|
21
|
-
"@atlaspack/rust": "3.4.
|
|
19
|
+
"@atlaspack/diagnostic": "2.14.2-typescript-08dcc1c9b.0",
|
|
20
|
+
"@atlaspack/events": "2.14.2-typescript-08dcc1c9b.0",
|
|
21
|
+
"@atlaspack/rust": "3.4.2-typescript-08dcc1c9b.0"
|
|
22
22
|
},
|
|
23
23
|
"type": "commonjs",
|
|
24
|
-
"
|
|
24
|
+
"scripts": {
|
|
25
|
+
"check-ts": "tsc --noEmit"
|
|
26
|
+
},
|
|
27
|
+
"types": "src/Logger.ts",
|
|
28
|
+
"gitHead": "08dcc1c9bcdc6ab931d55e05ccc0f45669de2f22"
|
|
25
29
|
}
|
|
@@ -1,5 +1,3 @@
|
|
|
1
|
-
// @flow strict-local
|
|
2
|
-
|
|
3
1
|
import type {
|
|
4
2
|
IDisposable,
|
|
5
3
|
LogEvent,
|
|
@@ -18,9 +16,9 @@ import {errorToDiagnostic, anyToDiagnostic} from '@atlaspack/diagnostic';
|
|
|
18
16
|
export {instrument, instrumentAsync} from './tracer';
|
|
19
17
|
|
|
20
18
|
class Logger {
|
|
21
|
-
#logEmitter
|
|
19
|
+
#logEmitter: ValueEmitter<LogEvent> = new ValueEmitter();
|
|
22
20
|
|
|
23
|
-
onLog(cb: (event: LogEvent) =>
|
|
21
|
+
onLog(cb: (event: LogEvent) => unknown): IDisposable {
|
|
24
22
|
return this.#logEmitter.addListener(cb);
|
|
25
23
|
}
|
|
26
24
|
|
|
@@ -53,7 +51,7 @@ class Logger {
|
|
|
53
51
|
}
|
|
54
52
|
|
|
55
53
|
error(input: Diagnostifiable, realOrigin?: string): void {
|
|
56
|
-
let diagnostic = anyToDiagnostic(input)
|
|
54
|
+
let diagnostic = anyToDiagnostic(input) as Diagnostic | Array<Diagnostic>;
|
|
57
55
|
if (typeof realOrigin === 'string') {
|
|
58
56
|
diagnostic = Array.isArray(diagnostic)
|
|
59
57
|
? diagnostic.map((d) => {
|
|
@@ -85,9 +83,9 @@ const logger: Logger = new Logger();
|
|
|
85
83
|
export default logger;
|
|
86
84
|
|
|
87
85
|
/** @private */
|
|
88
|
-
export type PluginLoggerOpts = {
|
|
89
|
-
origin: string
|
|
90
|
-
|
|
86
|
+
export type PluginLoggerOpts = {
|
|
87
|
+
origin: string;
|
|
88
|
+
};
|
|
91
89
|
|
|
92
90
|
export class PluginLogger implements IPluginLogger {
|
|
93
91
|
/** @private */
|
|
@@ -106,7 +104,7 @@ export class PluginLogger implements IPluginLogger {
|
|
|
106
104
|
? diagnostic.map((d) => {
|
|
107
105
|
return {...d, origin: this.origin};
|
|
108
106
|
})
|
|
109
|
-
: {...diagnostic, origin: this.origin};
|
|
107
|
+
: ({...diagnostic, origin: this.origin} as Diagnostic);
|
|
110
108
|
}
|
|
111
109
|
|
|
112
110
|
verbose(
|
|
@@ -149,7 +147,7 @@ export class PluginLogger implements IPluginLogger {
|
|
|
149
147
|
}
|
|
150
148
|
|
|
151
149
|
/** @private */
|
|
152
|
-
export const INTERNAL_ORIGINAL_CONSOLE = {...console};
|
|
150
|
+
export const INTERNAL_ORIGINAL_CONSOLE = {...console} as const;
|
|
153
151
|
let consolePatched = false;
|
|
154
152
|
|
|
155
153
|
/**
|
|
@@ -162,24 +160,20 @@ export function patchConsole() {
|
|
|
162
160
|
if (consolePatched) return;
|
|
163
161
|
|
|
164
162
|
/* eslint-disable no-console */
|
|
165
|
-
|
|
166
|
-
console.log = console.info = (...messages: Array<mixed>) => {
|
|
163
|
+
console.log = console.info = (...messages: Array<unknown>) => {
|
|
167
164
|
logger.info(messagesToDiagnostic(messages));
|
|
168
165
|
};
|
|
169
166
|
|
|
170
|
-
|
|
171
|
-
console.debug = (...messages: Array<mixed>) => {
|
|
167
|
+
console.debug = (...messages: Array<unknown>) => {
|
|
172
168
|
// TODO: dedicated debug level?
|
|
173
169
|
logger.verbose(messagesToDiagnostic(messages));
|
|
174
170
|
};
|
|
175
171
|
|
|
176
|
-
|
|
177
|
-
console.warn = (...messages: Array<mixed>) => {
|
|
172
|
+
console.warn = (...messages: Array<unknown>) => {
|
|
178
173
|
logger.warn(messagesToDiagnostic(messages));
|
|
179
174
|
};
|
|
180
175
|
|
|
181
|
-
|
|
182
|
-
console.error = (...messages: Array<mixed>) => {
|
|
176
|
+
console.error = (...messages: Array<unknown>) => {
|
|
183
177
|
logger.error(messagesToDiagnostic(messages));
|
|
184
178
|
};
|
|
185
179
|
|
|
@@ -193,19 +187,14 @@ export function unpatchConsole() {
|
|
|
193
187
|
if (!consolePatched) return;
|
|
194
188
|
|
|
195
189
|
/* eslint-disable no-console */
|
|
196
|
-
// $FlowFixMe
|
|
197
190
|
console.log = INTERNAL_ORIGINAL_CONSOLE.log;
|
|
198
191
|
|
|
199
|
-
// $FlowFixMe
|
|
200
192
|
console.info = INTERNAL_ORIGINAL_CONSOLE.info;
|
|
201
193
|
|
|
202
|
-
// $FlowFixMe
|
|
203
194
|
console.debug = INTERNAL_ORIGINAL_CONSOLE.debug;
|
|
204
195
|
|
|
205
|
-
// $FlowFixMe
|
|
206
196
|
console.warn = INTERNAL_ORIGINAL_CONSOLE.warn;
|
|
207
197
|
|
|
208
|
-
// $FlowFixMe
|
|
209
198
|
console.error = INTERNAL_ORIGINAL_CONSOLE.error;
|
|
210
199
|
|
|
211
200
|
/* eslint-enable no-console */
|
|
@@ -213,11 +202,11 @@ export function unpatchConsole() {
|
|
|
213
202
|
}
|
|
214
203
|
|
|
215
204
|
function messagesToDiagnostic(
|
|
216
|
-
messages: Array<
|
|
205
|
+
messages: Array<unknown>,
|
|
217
206
|
): Diagnostic | Array<Diagnostic> {
|
|
218
207
|
if (messages.length === 1 && messages[0] instanceof Error) {
|
|
219
208
|
let error: Error = messages[0];
|
|
220
|
-
let diagnostic = errorToDiagnostic(error)
|
|
209
|
+
let diagnostic = errorToDiagnostic(error) as Diagnostic | Array<Diagnostic>;
|
|
221
210
|
|
|
222
211
|
if (Array.isArray(diagnostic)) {
|
|
223
212
|
return diagnostic.map((d) => {
|
|
@@ -241,7 +230,7 @@ function messagesToDiagnostic(
|
|
|
241
230
|
}
|
|
242
231
|
}
|
|
243
232
|
|
|
244
|
-
function joinLogMessages(messages: Array<
|
|
233
|
+
function joinLogMessages(messages: Array<unknown>): string {
|
|
245
234
|
return messages
|
|
246
235
|
.map((m) => (typeof m === 'string' ? m : inspect(m)))
|
|
247
236
|
.join(' ');
|
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
// @flow strict-local
|
|
2
|
-
|
|
3
1
|
import assert from 'assert';
|
|
4
2
|
import sinon from 'sinon';
|
|
5
3
|
import Logger from '../src/Logger';
|
|
6
4
|
|
|
7
5
|
describe('Logger', () => {
|
|
8
|
-
let onLog;
|
|
9
|
-
let logDisposable;
|
|
6
|
+
let onLog: any;
|
|
7
|
+
let logDisposable: any;
|
|
10
8
|
beforeEach(() => {
|
|
11
9
|
onLog = sinon.spy();
|
|
12
10
|
logDisposable = Logger.onLog(onLog);
|
package/tsconfig.json
ADDED