Skip to content
This repository was archived by the owner on Mar 16, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@hatsy/log-z-request",
"version": "2.2.0",
"version": "3.0.0-dev.0",
"description": "Hatsy request logger",
"homepage": "https://github.com/hatsyjs/log-z-request",
"repository": {
Expand All @@ -17,18 +17,19 @@
"types": "./index.d.ts",
"exports": "./dist/log-z-request.js",
"dependencies": {
"@proc7ts/logger": "^1.2.0-dev.3",
"@proc7ts/primitives": "^3.0.0"
},
"peerDependencies": {
"@hatsy/hatsy": "^2.4.0",
"@run-z/log-z": "^1.5.0"
"@hatsy/hatsy": "^2.5.0-dev.0",
"@run-z/log-z": "^2.0.0-dev.3"
},
"devDependencies": {
"@hatsy/hatsy": "^2.4.0",
"@hatsy/hatsy": "^2.5.0-dev.0",
"@jest/globals": "^27.0.3",
"@rollup/plugin-node-resolve": "^13.0.0",
"@run-z/eslint-config": "^1.3.0",
"@run-z/log-z": "^1.6.0",
"@run-z/log-z": "^2.0.0-dev.3",
"@run-z/rollup-helpers": "^1.1.1",
"@types/node": "^12.20.15",
"@typescript-eslint/eslint-plugin": "^4.27.0",
Expand Down
4 changes: 2 additions & 2 deletions src/error-logging.handler.impl.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import type { ErrorMeans, LoggerMeans, RequestContext, RequestHandler } from '@hatsy/hatsy/core';
import { requestExtension } from '@hatsy/hatsy/core';
import type { ZLogger } from '@run-z/log-z';
import { zlogDetails, zlogError } from '@run-z/log-z';
import { zlogDetails } from '@run-z/log-z';
import type { RequestZLogConfig } from './logging';

/**
Expand Down Expand Up @@ -32,5 +32,5 @@ export function errorLoggingHandler<TInput>(
function logImmediately(
{ error, log }: RequestContext<LoggerMeans<ZLogger> & ErrorMeans>,
): void {
log.error(zlogError(error), zlogDetails({ immediate: true }));
log.error(zlogDetails({ error, immediate: true }));
}
21 changes: 11 additions & 10 deletions src/logging.spec.ts
Original file line number Diff line number Diff line change
@@ -1,9 +1,10 @@
import type { RequestContext, RequestProcessor } from '@hatsy/hatsy/core';
import { LoggerMeans, RequestHandler, requestProcessor } from '@hatsy/hatsy/core';
import { afterEach, beforeEach, describe, expect, it, jest } from '@jest/globals';
import { consoleLogger, processingLogger } from '@proc7ts/logger';
import { asis, newPromiseResolver, noop, valueProvider } from '@proc7ts/primitives';
import type { ZLogger, ZLogRecorder } from '@run-z/log-z';
import { zlogDetails, zlogINFO, ZLogLevel } from '@run-z/log-z';
import { logZToLogger, zlogDetails, zlogINFO, ZLogLevel } from '@run-z/log-z';
import type { SpyInstance } from 'jest-mock';
import type { RequestZLogConfig } from './logging';
import { ZLogging } from './logging';
Expand All @@ -14,8 +15,8 @@ describe('ZLogging', () => {
let errorSpy: SpyInstance<void, unknown[]>;

beforeEach(() => {
infoSpy = jest.spyOn(console, 'info').mockImplementation(noop);
errorSpy = jest.spyOn(console, 'error').mockImplementation(noop);
infoSpy = jest.spyOn(consoleLogger, 'info').mockImplementation(noop);
errorSpy = jest.spyOn(consoleLogger, 'error').mockImplementation(noop);
});
afterEach(() => {
infoSpy.mockRestore();
Expand Down Expand Up @@ -43,8 +44,8 @@ describe('ZLogging', () => {
whenLogged2.resolve(true);
await promise;

expect(infoSpy).toHaveBeenCalledWith('%s', 'Info');
expect(errorSpy).toHaveBeenCalledWith('%s', 'Error');
expect(infoSpy).toHaveBeenCalledWith('Info');
expect(errorSpy).toHaveBeenCalledWith('Error');
});
it('allows to trigger immediate logging', async () => {

Expand All @@ -67,8 +68,8 @@ describe('ZLogging', () => {
whenLogged2.resolve(true);
await promise;

expect(infoSpy).toHaveBeenCalledWith('%s', 'Deferred');
expect(infoSpy).toHaveBeenCalledWith('%s', 'Immediate');
expect(infoSpy).toHaveBeenCalledWith('Deferred');
expect(infoSpy).toHaveBeenCalledWith('Immediate');
});
it('triggers immediate logging on error', async () => {

Expand All @@ -80,7 +81,7 @@ describe('ZLogging', () => {
await whenError.promise();
};

const promise = processor(handler)({});
const promise = processor(handler, { by: logZToLogger(processingLogger(consoleLogger)) })({});

await whenLogged.promise();

Expand All @@ -91,8 +92,8 @@ describe('ZLogging', () => {
whenError.reject(error);
expect(await promise.catch(asis)).toBe(error);

expect(infoSpy).toHaveBeenCalledWith('%s', 'Deferred');
expect(errorSpy).toHaveBeenCalledWith('%s', error);
expect(infoSpy).toHaveBeenCalledWith('Deferred');
expect(errorSpy).toHaveBeenCalledWith(error);
});

describe('logError', () => {
Expand Down
2 changes: 1 addition & 1 deletion src/logging.ts
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ export interface RequestZLogConfig<TInput = unknown> {
/**
* Logs an error occurred during error processing.
*
* Logs the error as is by default.
* Logs the error as an `error` detail.
*
* @param context - Error processing context with logger means.
*
Expand Down