ESLint v9 & Prettier v4

surol · surol · commit e0ad44662840 · 2024-10-09T15:41:58.000+07:00
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
diff --git a/eslint.config.js b/eslint.config.js
@@ -0,0 +1,3 @@
+import configs from '@run-z/eslint-config';
+
+export default configs;
diff --git a/package.json b/package.json
@@ -57,22 +57,17 @@
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@run-z/eslint-config": "^4.2.0",
-    "@run-z/prettier-config": "^2.0.0",
+    "@run-z/eslint-config": "^5.0.0",
+    "@run-z/prettier-config": "^3.0.0",
     "@run-z/project-config": "^0.20.4",
     "@swc/core": "^1.7.26",
     "@swc/jest": "^0.2.36",
     "@types/node": "^20.16.11",
-    "@typescript-eslint/eslint-plugin": "^7.18.0",
-    "@typescript-eslint/parser": "^7.18.0",
-    "eslint": "^8.57.1",
-    "eslint-plugin-jest": "^28.8.3",
+    "eslint": "^9.12.0",
     "gh-pages": "^6.1.1",
     "jest": "^29.7.0",
     "jest-junit": "^16.0.0",
-    "jest-mock": "^29.7.0",
-    "prettier": "^2.8.8",
-    "prettier-eslint-cli": "^7.1.0",
+    "prettier": "^3.3.3",
     "rollup": "^4.24.0",
     "run-z": "^2.1.0",
     "ts-jest": "^29.2.5",
@@ -87,7 +82,7 @@
     "clean": "run-z +z --then clean-z",
     "doc": "run-z +z --then typedoc",
     "doc:publish": "run-z doc --then gh-pages --dist target/typedoc --dotfiles",
-    "format": "run-z +z --then prettier-eslint --write --include-dot-files \"src/**/*.*\" \"*.{js,cjs,json,md}\"",
+    "format": "run-z +z --then prettier --write \"src/**/*.*\" \"*.{js,cjs,json,md}\"",
     "lint": "run-z +z --then eslint .",
     "test": "run-z +z env:NODE_OPTIONS=\"--experimental-vm-modules --no-warnings\" --then test-z",
     "z": "run-z +cmd:build-z,+cmd:typedoc,+cmd:eslint,+cmd:test-z"
diff --git a/prettier.config.js b/prettier.config.js
@@ -0,0 +1,3 @@
+import config from '@run-z/prettier-config';
+
+export default config;
diff --git a/src/core/dispatch-error.ts b/src/core/dispatch-error.ts
@@ -17,7 +17,8 @@ export function dispatchError<TMeans>(
   onError: RequestHandler<TMeans & ErrorMeans>,
   handler: RequestHandler<TMeans>,
 ): RequestHandler<TMeans> {
-  return context => context
+  return context =>
+    context
       .next(handler)
       .catch(error => context.next<ErrorMeans>(onError, requestExtension({ error })));
 }
diff --git a/src/core/logging/logging.capability.ts b/src/core/logging/logging.capability.ts
@@ -31,8 +31,8 @@ export interface Logging<TInput = unknown, TLogger extends RequestLogger = Reque
  */
 class LoggingCapability<TInput, TLogger extends RequestLogger>
   extends RequestCapability<TInput, LoggerMeans<TLogger>>
-  implements Logging<TInput, TLogger> {
-
+  implements Logging<TInput, TLogger>
+{
   readonly for: <TMeans extends TInput>(
     handler: RequestHandler<TMeans & LoggerMeans<TLogger>>,
   ) => RequestHandler<TMeans>;
@@ -43,7 +43,8 @@ class LoggingCapability<TInput, TLogger extends RequestLogger>
       this.for =
         <TMeans extends TInput>(
           handler: RequestHandler<TMeans & LoggerMeans<TLogger>>,
-        ): RequestHandler<TMeans> => context => {
+        ): RequestHandler<TMeans> =>
+        context => {
           if ((context as Partial<LoggerMeans>).log) {
             return context.next(handler);
           }
@@ -54,14 +55,15 @@ class LoggingCapability<TInput, TLogger extends RequestLogger>
       this.for =
         <TMeans extends TInput>(
           handler: RequestHandler<TMeans & LoggerMeans<TLogger>>,
-        ): RequestHandler<TMeans> => context => context.next(handler, requestExtension({ log }));
+        ): RequestHandler<TMeans> =>
+        context =>
+          context.next(handler, requestExtension({ log }));
     }
   }
 
   logBy<TNewLogger extends RequestLogger>(log: TNewLogger): Logging<TInput, TNewLogger> {
     return new LoggingCapability(log);
   }
-
 }
 
 /**
diff --git a/src/core/logging/logging.spec.ts b/src/core/logging/logging.spec.ts
@@ -1,7 +1,6 @@
 import { beforeEach, describe, expect, it, jest } from '@jest/globals';
 import { consoleLogger, silentLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
-import type { Mock } from 'jest-mock';
 import type { RequestContext } from '../request-context.js';
 import type { RequestHandler } from '../request-handler.js';
 import type { RequestProcessor } from '../request-processor.js';
@@ -11,7 +10,7 @@ import { Logging } from './logging.capability.js';
 import type { RequestLogger } from './request-logger.js';
 
 describe('Logging', () => {
-  let handler: Mock<(context: RequestContext<LoggerMeans>) => void>;
+  let handler: jest.Mock<(context: RequestContext<LoggerMeans>) => void>;
 
   beforeEach(() => {
     handler = jest.fn();
diff --git a/src/core/request-capability.ts b/src/core/request-capability.ts
@@ -11,7 +11,6 @@ import type { RequestHandler } from './request-handler.js';
  * @typeParam TExt - A type of extension to request processing means this capability applies.
  */
 export abstract class RequestCapability<TInput, TExt = object> {
-
   /**
    * Builds request capability by the given `provider`.
    *
@@ -101,7 +100,6 @@ export abstract class RequestCapability<TInput, TExt = object> {
   ): RequestCapability<TInput, TExt & TNext> {
     return RequestCapability.combine<TInput, TExt, TNext>(this, next);
   }
-
 }
 
 export namespace RequestCapability {
diff --git a/src/core/request-handler.spec.ts b/src/core/request-handler.spec.ts
@@ -51,7 +51,8 @@ describe('requestHandler', () => {
     const error = new Error('test');
     const calls: number[] = [];
 
-    const call = async (): Promise<unknown> => await requestHandler([
+    const call = async (): Promise<unknown> =>
+      await requestHandler([
         () => {
           calls.push(1);
         },
@@ -69,7 +70,8 @@ describe('requestHandler', () => {
   });
   it('stops handlers execution once response written', async () => {
     const calls: number[] = [];
-    const call = async (): Promise<unknown> => await requestHandler([
+    const call = async (): Promise<unknown> =>
+      await requestHandler([
         () => {
           calls.push(1);
         },
diff --git a/src/http/http-error.ts b/src/http/http-error.ts
@@ -9,7 +9,6 @@ import type { DueLog, Loggable } from '@proc7ts/logger';
  * @see HttpConfig.errorHandler
  */
 export class HttpError extends Error implements Loggable {
-
   readonly #statusCode: number;
   readonly #statusMessage?: string | undefined;
   readonly #details?: string | undefined;
@@ -76,7 +75,6 @@ export class HttpError extends Error implements Loggable {
 
     return report;
   }
-
 }
 
 function httpErrorMessage(
diff --git a/src/http/http-listener.spec.ts b/src/http/http-listener.spec.ts
@@ -10,7 +10,6 @@ import {
 } from '@jest/globals';
 import { consoleLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
-import type { Mock } from 'jest-mock';
 import { ErrorMeans } from '../core/error.means.js';
 import { RequestContext } from '../core/request-context.js';
 import { TestHttpServer } from '../testing/test-http-server.js';
@@ -33,7 +32,7 @@ describe('httpListener', () => {
     server.listenBy(noop);
   });
 
-  let logErrorSpy: Mock<(...args: unknown[]) => void>;
+  let logErrorSpy: jest.Mock<(...args: unknown[]) => void>;
 
   beforeEach(() => {
     logErrorSpy = jest.spyOn(consoleLogger, 'error').mockImplementation(noop) as typeof logErrorSpy;
diff --git a/src/http/http-listener.ts b/src/http/http-listener.ts
@@ -185,7 +185,9 @@ function fullHttpHandler<TExt, TRequest extends IncomingMessage, TResponse exten
 ): RequestHandler<HttpMeans<TRequest, TResponse> & TExt> {
   const defaultHandler = defaultHttpHandler(config);
 
-  return dispatchError(httpErrorHandler(config), ({ next }) => next(handler).then(ok => ok || next(defaultHandler)));
+  return dispatchError(httpErrorHandler(config), ({ next }) =>
+    next(handler).then(ok => ok || next(defaultHandler)),
+  );
 }
 
 /**
@@ -226,8 +228,8 @@ function httpErrorHandler<
       ? renderHttpError
       : errorHandler
     : defaultHandler
-    ? renderEmptyHttpResponse
-    : noop;
+      ? renderEmptyHttpResponse
+      : noop;
 
   if (!logError) {
     return onError;
diff --git a/src/http/middleware.spec.ts b/src/http/middleware.spec.ts
@@ -10,7 +10,6 @@ import {
 } from '@jest/globals';
 import { silentLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
-import type { Mock } from 'jest-mock';
 import { Logging } from '../core/logging/logging.capability.js';
 import { TestHttpServer } from '../testing/test-http-server.js';
 import { HttpError } from './http-error.js';
@@ -31,7 +30,7 @@ describe('middleware', () => {
     server.listenBy(noop);
   });
 
-  let ware: Mock<Middleware>;
+  let ware: jest.Mock<Middleware>;
 
   beforeEach(() => {
     ware = jest.fn((_request, _response, next) => next());
@@ -64,7 +63,9 @@ describe('middleware', () => {
     expect(ware).toHaveBeenCalledTimes(1);
   });
   it('allows middleware to error', async () => {
-    ware.mockImplementation((_request, _response, next) => next(new HttpError(503, { statusMessage: 'Custom Error' })));
+    ware.mockImplementation((_request, _response, next) =>
+      next(new HttpError(503, { statusMessage: 'Custom Error' })),
+    );
 
     server.handleBy(
       {
diff --git a/src/http/middleware.ts b/src/http/middleware.ts
@@ -49,7 +49,8 @@ export function middleware<TInput extends HttpMeans>(
   function middlewareProvider<TMeans extends TInput>(
     handler: RequestHandler<TMeans>,
   ): RequestHandler<TMeans> {
-    return async ({ request, response, next }: RequestContext<TMeans>) => await new Promise<void>((resolve, reject) => {
+    return async ({ request, response, next }: RequestContext<TMeans>) =>
+      await new Promise<void>((resolve, reject) => {
         const mdNext = (error?: unknown): void => {
           if (error !== undefined) {
             reject(error);
diff --git a/src/http/render/rendering.capability.ts b/src/http/render/rendering.capability.ts
@@ -8,7 +8,6 @@ import type { RenderMeans } from './render.means.js';
  * @internal
  */
 class RenderingCapability extends RequestCapability<HttpMeans, RenderMeans> {
-
   for<TMeans extends HttpMeans>(
     handler: RequestHandler<TMeans & RenderMeans>,
   ): RequestHandler<TMeans> {
@@ -42,7 +41,6 @@ class RenderingCapability extends RequestCapability<HttpMeans, RenderMeans> {
       );
     };
   }
-
 }
 
 /**
diff --git a/src/http/request/form-decoding.capability.ts b/src/http/request/form-decoding.capability.ts
@@ -51,8 +51,8 @@ export interface FormDecoding<TInput extends HttpMeans = HttpMeans, TBody = URLS
  */
 class FormDecodingCapability<TInput extends HttpMeans, TBody>
   extends RequestCapability<TInput, RequestBodyMeans<TBody>>
-  implements FormDecoding<TInput, TBody> {
-
+  implements FormDecoding<TInput, TBody>
+{
   readonly #transform: RequestValueTransformer<TInput, URLSearchParams, TBody>;
 
   constructor(transform: RequestValueTransformer<TInput, URLSearchParams, TBody>) {
@@ -89,7 +89,6 @@ class FormDecodingCapability<TInput extends HttpMeans, TBody>
   ): FormDecoding<TMeans, TTransformed> {
     return new FormDecodingCapability<TMeans, TTransformed>(transformer);
   }
-
 }
 
 /**
diff --git a/src/http/request/http-forwarding.capability.ts b/src/http/request/http-forwarding.capability.ts
@@ -29,7 +29,6 @@ export interface HttpForwarding extends RequestCapability<HttpMeans> {
  * @internal
  */
 class HttpForwardingCapability extends RequestCapability<HttpMeans> implements HttpForwarding {
-
   readonly #trust: HttpForwardTrust;
 
   constructor(trust: HttpForwardTrust) {
@@ -60,7 +59,6 @@ class HttpForwardingCapability extends RequestCapability<HttpMeans> implements H
   with(trust: HttpForwardTrust): HttpForwarding {
     return new HttpForwardingCapability(trust);
   }
-
 }
 
 /**
diff --git a/src/http/request/json-parsing.capability.spec.ts b/src/http/request/json-parsing.capability.spec.ts
@@ -10,7 +10,6 @@ import {
 } from '@jest/globals';
 import { consoleLogger } from '@proc7ts/logger';
 import { noop } from '@proc7ts/primitives';
-import type { Mock } from 'jest-mock';
 import { TestHttpServer } from '../../testing/test-http-server.js';
 import { HttpError } from '../http-error.js';
 import { Rendering } from '../render/rendering.capability.js';
@@ -26,7 +25,7 @@ describe('JsonParsing', () => {
     await server.stop();
   });
 
-  let logErrorSpy: Mock<(...args: unknown[]) => void>;
+  let logErrorSpy: jest.Mock<(...args: unknown[]) => void>;
 
   beforeEach(() => {
     logErrorSpy = jest.spyOn(consoleLogger, 'error').mockImplementation(noop) as typeof logErrorSpy;
diff --git a/src/http/request/json-parsing.capability.ts b/src/http/request/json-parsing.capability.ts
@@ -53,8 +53,8 @@ export interface JsonParsing<TInput extends HttpMeans = HttpMeans, TBody = any>
  */
 class JsonParsingCapability<TInput extends HttpMeans, TBody>
   extends RequestCapability<TInput, RequestBodyMeans<TBody>>
-  implements JsonParsing<TInput, TBody> {
-
+  implements JsonParsing<TInput, TBody>
+{
   readonly #transform: RequestValueTransformer<TInput, any, TBody>;
 
   constructor(transform: RequestValueTransformer<TInput, any, TBody>) {
@@ -96,7 +96,6 @@ class JsonParsingCapability<TInput extends HttpMeans, TBody>
   ): FormDecoding<TMeans, TTransformed> {
     return new JsonParsingCapability<TMeans, TTransformed>(transformer);
   }
-
 }
 
 /**
diff --git a/src/testing/test-http-server.ts b/src/testing/test-http-server.ts
@@ -19,7 +19,6 @@ import { readAll } from '../impl/read-all.js';
  * Testing HTTP server and client.
  */
 export class TestHttpServer {
-
   /**
    * Starts new test HTTP server and binds it ro random port ad localhost.
    *
@@ -117,7 +116,9 @@ export class TestHttpServer {
    */
   #start(): Promise<TestHttpServer> {
     return new Promise((resolve, reject) => {
-      const server = (this.#server = createServer((request, response) => this.#listener(request, response)));
+      const server = (this.#server = createServer((request, response) =>
+        this.#listener(request, response),
+      ));
 
       server.on('error', reject);
       server.on('listening', () => resolve(this));
@@ -183,7 +184,6 @@ export class TestHttpServer {
   stop(): Promise<void> {
     return promisify(this.server.close.bind(this.server))();
   }
-
 }
 
 export namespace TestHttpServer {

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import configs from '@run-z/eslint-config';`
	`2`	`+`
	`3`	`+export default configs;`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import config from '@run-z/prettier-config';`
	`2`	`+`
	`3`	`+export default config;`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ import type { RequestHandler } from './request-handler.js';`
`11`	`11`	`* @typeParam TExt - A type of extension to request processing means this capability applies.`
`12`	`12`	`*/`
`13`	`13`	`export abstract class RequestCapability<TInput, TExt = object> {`
`14`		`-`
`15`	`14`	`/**`
`16`	`15`	* Builds request capability by the given `provider`.
`17`	`16`	`*`
`@@ -101,7 +100,6 @@ export abstract class RequestCapability<TInput, TExt = object> {`
`101`	`100`	`): RequestCapability<TInput, TExt & TNext> {`
`102`	`101`	`return RequestCapability.combine<TInput, TExt, TNext>(this, next);`
`103`	`102`	`}`
`104`		`-`
`105`	`103`	`}`
`106`	`104`
`107`	`105`	`export namespace RequestCapability {`