Switch to ES2022

Author: surol

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hatsy/hatsy",
-  "version": "2.5.3",
+  "version": "3.0.0-pre.0",
   "description": "Asynchronous TypeScript-friendly HTTP server for Node.js",
   "keywords": [
     "http-framework",
@@ -22,10 +22,10 @@
   "types": "./dist/hatsy.d.ts",
   "typesVersions": {
     "*": {
-      "core": [
+      "core.js": [
         "./dist/hatsy.core.d.ts"
       ],
-      "testing": [
+      "testing.js": [
         "./dist/hatsy.testing.d.ts"
       ]
     }
@@ -35,30 +35,28 @@
       "types": "./dist/hatsy.d.ts",
       "default": "./dist/hatsy.js"
     },
-    "./core": {
+    "./core.js": {
       "types": "./dist/hatsy.core.d.ts",
       "default": "./dist/hatsy.core.js"
     },
     "./package.json": "./package.json",
-    "./testing": {
+    "./testing.js": {
       "types": "./dist/hatsy.testing.d.ts",
       "default": "./dist/hatsy.testing.js"
     }
   },
   "sideEffects": false,
   "dependencies": {
-    "@frontmeans/httongue": "^2.4.0",
-    "@hatsy/http-header-value": "^3.7.1",
-    "@proc7ts/logger": "^1.3.2",
-    "@proc7ts/primitives": "^3.0.2"
+    "@proc7ts/logger": "^2.0.0",
+    "@proc7ts/primitives": "^4.0.1",
+    "httongue": "^3.1.0",
+    "http-header-value": "^4.0.0"
   },
   "engines": {
-    "node": ">=12"
+    "node": ">=18"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@proc7ts/context-values": "^7.1.1",
-    "@proc7ts/logger": "^1.3.2",
     "@run-z/eslint-config": "^3.5.0",
     "@run-z/prettier-config": "^2.0.0",
     "@run-z/project-config": "^0.20.0",

src/http/dispatch/dispatch-by-accepted.handler.ts

@@ -1,4 +1,4 @@
-import { httpMimeNegotiator } from '@hatsy/http-header-value/headers';
+import { httpMimeNegotiator } from 'http-header-value/headers.js';
 import type { RequestHandler, RequestHandlerMethod } from '../../core';
 import { HttpError } from '../http-error';
 import type { HttpMeans } from '../http.means';

src/http/dispatch/dispatch-by-language.handler.ts

@@ -1,4 +1,4 @@
-import { httpLanguageNegotiator } from '@hatsy/http-header-value/headers';
+import { httpLanguageNegotiator } from 'http-header-value/headers.js';
 import type { RequestHandler, RequestHandlerMethod } from '../../core';
 import { HttpError } from '../http-error';
 import type { HttpMeans } from '../http.means';

src/http/http-listener.ts

@@ -1,14 +1,14 @@
-import { HttpAddressRep } from '@hatsy/http-header-value/node';
 import { consoleLogger } from '@proc7ts/logger';
 import { lazyValue, noop } from '@proc7ts/primitives';
+import { HttpAddressRep } from 'http-header-value/node.js';
 import type { IncomingMessage, ServerResponse } from 'node:http';
 import {
-  dispatchError,
   ErrorMeans,
   LoggerMeans,
   Logging,
   RequestContext,
   RequestHandler,
+  dispatchError,
   requestProcessor,
 } from '../core';
 import type { HttpConfig } from './http-config';

src/http/render/render-http-error.handler.ts

@@ -1,4 +1,4 @@
-import { escapeXML, MIMEType } from '@frontmeans/httongue';
+import { escapeXML } from 'httongue';
 import { STATUS_CODES } from 'node:http';
 import type { ErrorMeans, RequestContext, RequestHandler } from '../../core';
 import { dispatchByAccepted } from '../dispatch';
@@ -79,9 +79,9 @@ function renderJsonError(context: RequestContext<HttpMeans & RenderMeans & Error
 export const renderHttpError: RequestHandler<HttpMeans & ErrorMeans> = /*#__PURE__*/ Rendering.for(
   /*#__PURE__*/ dispatchByAccepted<HttpMeans & ErrorMeans & RenderMeans>(
     {
-      [MIMEType.JSON]: renderJsonError,
-      [MIMEType.TextJSON]: renderJsonError,
-      [MIMEType.HTML]: renderHtmlError,
+      'application/json': renderJsonError,
+      'text/json': renderJsonError,
+      'text/html': renderHtmlError,
       '*/*': renderHtmlError,
     },
     renderHtmlError,

src/http/render/rendering.capability.ts

@@ -1,4 +1,3 @@
-import { MIMEType } from '@frontmeans/httongue';
 import { RequestCapability, requestExtension, RequestHandler } from '../../core';
 import type { HttpMeans } from '../http.means';
 import type { RenderMeans } from './render.means';
@@ -29,12 +28,12 @@ class RenderingCapability extends RequestCapability<HttpMeans, RenderMeans> {
           renderBody,
 
           renderHtml(html: string | Buffer) {
-            response.setHeader('Content-Type', `${MIMEType.HTML}; charset=utf-8`);
+            response.setHeader('Content-Type', `text/html; charset=utf-8`);
             renderBody(html);
           },
 
           renderJson(body: unknown) {
-            response.setHeader('Content-Type', `${MIMEType.JSON}; charset=utf-8`);
+            response.setHeader('Content-Type', `application/json; charset=utf-8`);
             renderBody(JSON.stringify(body));
           },
         }),

src/http/request/form-decoding.capability.ts

@@ -1,4 +1,3 @@
-import { MIMEType } from '@frontmeans/httongue';
 import { asis } from '@proc7ts/primitives';
 import { URLSearchParams } from 'node:url';
 import {
@@ -17,8 +16,8 @@ import type { HttpMeans } from '../http.means';
  * @internal
  */
 const URL_ENCODED_MIMES: Record<string, number> = {
-  [MIMEType.Text]: 1,
-  [MIMEType.FormURLEncoded]: 1,
+  'text/plain': 1,
+  'application/x-www-form-urlencoded': 1,
 };
 
 /**
@@ -67,11 +66,11 @@ class FormDecodingCapability<TInput extends HttpMeans, TBody>
   ): RequestHandler<TMeans> {
     return async context => {
       const { request } = context;
-      const { 'content-type': contentType = MIMEType.Text } = request.headers;
+      const { 'content-type': contentType = 'text/plain' } = request.headers;
 
       if (!URL_ENCODED_MIMES[contentType]) {
         return Promise.reject(
-          new HttpError(415, { details: `${MIMEType.FormURLEncoded} request expected` }),
+          new HttpError(415, { details: `application/x-www-form-urlencoded request expected` }),
         );
       }
 

src/http/request/http-forwarding.capability.ts

@@ -1,6 +1,6 @@
-import type { HttpForwardTrust } from '@hatsy/http-header-value/headers';
-import { HttpAddressRep } from '@hatsy/http-header-value/node';
 import { lazyValue } from '@proc7ts/primitives';
+import type { HttpForwardTrust } from 'http-header-value/headers.js';
+import { HttpAddressRep } from 'http-header-value/node.js';
 import { RequestCapability, RequestHandler, requestUpdate } from '../../core';
 import type { HttpMeans } from '../http.means';
 

src/http/request/json-parsing.capability.ts

@@ -1,4 +1,3 @@
-import { MIMEType } from '@frontmeans/httongue';
 import { asis } from '@proc7ts/primitives';
 import {
   RequestBodyMeans,
@@ -17,9 +16,9 @@ import type { FormDecoding } from './form-decoding.capability';
  * @internal
  */
 const JSON_MIMES: Readonly<Record<string, number>> = {
-  [MIMEType.Text]: 1,
-  [MIMEType.JSON]: 1,
-  [MIMEType.TextJSON]: 1,
+  'text/plain': 1,
+  'application/json': 1,
+  'text/json': 1,
 };
 
 /**
@@ -67,10 +66,10 @@ class JsonParsingCapability<TInput extends HttpMeans, TBody>
   ): RequestHandler<TMeans> {
     return async context => {
       const { request, next } = context;
-      const { 'content-type': contentType = MIMEType.Text } = request.headers;
+      const { 'content-type': contentType = 'text/plain' } = request.headers;
 
       if (!JSON_MIMES[contentType]) {
-        return Promise.reject(new HttpError(415, { details: `${MIMEType.JSON} request expected` }));
+        return Promise.reject(new HttpError(415, { details: `application/json request expected` }));
       }
 
       let json: unknown;

src/http/util/add-response-header.ts

@@ -1,4 +1,4 @@
-import { arrayOfElements, elementOrArray } from '@proc7ts/primitives';
+import { asArray, elementOrArray } from '@proc7ts/primitives';
 import type { ServerResponse } from 'node:http';
 
 /**
@@ -11,7 +11,7 @@ import type { ServerResponse } from 'node:http';
  * @param value - HTTP header value to add.
  */
 export function addResponseHeader(response: ServerResponse, name: string, value: string): void {
-  const oldValues = arrayOfElements(response.getHeader(name)).map(String);
+  const oldValues = asArray(response.getHeader(name)).map(String);
   const newValues = elementOrArray(new Set<string>(oldValues).add(value))!;
 
   response.setHeader(name, newValues);